From c0894572b4a069e52cd85dc8bb191c4beb3ccb58 Mon Sep 17 00:00:00 2001 From: Ruben de Vries Date: Thu, 28 Jul 2016 17:10:40 +0200 Subject: [PATCH 1/2] allow Guzzle v5.3.1 to be able to support php7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 42a3426..2920b43 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "require": { "php": ">=5.4.0", "99designs/http-signatures": ">=1.1.0 <3.0.0", - "guzzlehttp/guzzle": ">=4.2.0 <5.3.0" + "guzzlehttp/guzzle": ">=4.2.0 <=5.3.1" }, "require-dev": { "phpunit/phpunit": "~4.1" From 707a0dde1d42c3c0aa20466b241ec1b28c5a9e37 Mon Sep 17 00:00:00 2001 From: Ruben de Vries Date: Thu, 28 Jul 2016 17:11:31 +0200 Subject: [PATCH 2/2] enable PHP 7.0 and 7.1 in travis. add GuzzleHttp 5.3 and 5.3.1 to travis. disable Guzzle < 5.3.1 for 7.1. --- .travis.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.travis.yml b/.travis.yml index fb8310c..08adabb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ php: - 5.6 - 5.5 - 5.4 + - 7.0 + - 7.1 - hhvm install: composer require --no-update guzzlehttp/guzzle $GUZZLE_VERSION; composer update @@ -14,3 +16,16 @@ env: - GUZZLE_VERSION: 4.2 - GUZZLE_VERSION: 5.0 - GUZZLE_VERSION: 5.2 + - GUZZLE_VERSION: 5.3 + - GUZZLE_VERSION: 5.3.1 + +matrix: + exclude: + - php: 7.1 + env: GUZZLE_VERSION=4.2 + - php: 7.1 + env: GUZZLE_VERSION=5.0 + - php: 7.1 + env: GUZZLE_VERSION=5.2 + - php: 7.1 + env: GUZZLE_VERSION=5.3