Merge pull request #4 from blocktrail/guzzle-5.0

Guzzle 5.0
This commit is contained in:
Adrian Palmer 2015-03-05 16:42:37 +11:00
commit bd70008e56
2 changed files with 7 additions and 2 deletions

View File

@ -6,6 +6,11 @@ php:
- 5.4 - 5.4
- hhvm - hhvm
install: composer install install: composer require --no-update guzzlehttp/guzzle $GUZZLE_VERSION; composer update
script: vendor/bin/phpunit script: vendor/bin/phpunit
env:
- GUZZLE_VERSION: 4.2
- GUZZLE_VERSION: 5.0
- GUZZLE_VERSION: 5.2

View File

@ -22,7 +22,7 @@
"require": { "require": {
"php": ">=5.4.0", "php": ">=5.4.0",
"99designs/http-signatures": "~1.1", "99designs/http-signatures": "~1.1",
"guzzlehttp/guzzle": "~4.2" "guzzlehttp/guzzle": ">=4.2.0 <5.3.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.1" "phpunit/phpunit": "~4.1"