Merge pull request #4 from blocktrail/guzzle-5.0

Guzzle 5.0
99designs · Mar 5, 2015 · bd70008 · bd70008
2 parents e342862 + bcd6337
commit bd70008
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,11 @@ php:
   - 5.4
   - hhvm
 
-install: composer install
+install: composer require --no-update guzzlehttp/guzzle $GUZZLE_VERSION; composer update
 
 script: vendor/bin/phpunit
+
+env:
+  - GUZZLE_VERSION: 4.2
+  - GUZZLE_VERSION: 5.0
+  - GUZZLE_VERSION: 5.2
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     "require": {
         "php": ">=5.4.0",
         "99designs/http-signatures": "~1.1",
-        "guzzlehttp/guzzle": "~4.2"
+        "guzzlehttp/guzzle": ">=4.2.0 <5.3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.1"