From 0f8cfe839c8930e075031d20e9fbe44be24d5fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edi=20Modri=C4=87?= Date: Thu, 17 Aug 2017 15:01:43 +0200 Subject: [PATCH 1/2] Set the default value of queue in proxy client to an empty array --- src/ProxyClient/AbstractProxyClient.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProxyClient/AbstractProxyClient.php b/src/ProxyClient/AbstractProxyClient.php index 1fd596c8..6b70e518 100644 --- a/src/ProxyClient/AbstractProxyClient.php +++ b/src/ProxyClient/AbstractProxyClient.php @@ -48,7 +48,7 @@ abstract class AbstractProxyClient implements ProxyClientInterface * * @var array|RequestInterface[] */ - private $queue; + private $queue = array(); /** * Constructor. From dde6a09cae469d35041d3e6ef9e659e253fa458a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edi=20Modri=C4=87?= Date: Fri, 18 Aug 2017 10:36:20 +0200 Subject: [PATCH 2/2] Add PHP 7.1 and 7.2 to test matrix --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index aefe2418..f5883ecb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,9 @@ php: - 5.4 - 5.5 - 5.6 - - 7 + - 7.0 + - 7.1 + - 7.2 env: - VARNISH_VERSION=4.0 @@ -28,7 +30,7 @@ branches: before_script: # Install deps - composer update $COMPOSER_FLAGS --dev --prefer-source --no-interaction - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7' ]; then wget https://phar.phpunit.de/phpunit-5.7.phar; fi" + - bash -c "if [[ '$TRAVIS_PHP_VERSION' == '7.'* ]] ; then wget https://phar.phpunit.de/phpunit-5.7.phar; fi" # Install Varnish - curl http://repo.varnish-cache.org/debian/GPG-key.txt | sudo apt-key add - - echo "deb http://repo.varnish-cache.org/ubuntu/ precise varnish-${VARNISH_VERSION}" | sudo tee -a /etc/apt/sources.list @@ -42,7 +44,7 @@ before_script: - sh -c "if [ '$TRAVIS_PHP_VERSION' = 'hhvm' ]; then ./tests/ci/install-apache-hhvm.sh; fi" script: - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7' ]; then php phpunit-5.7.phar --coverage-clover=coverage.clover; fi" + - bash -c "if [[ '$TRAVIS_PHP_VERSION' == '7.'* ]] ; then php phpunit-5.7.phar --coverage-clover=coverage.clover; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' \< '7' ]; then phpunit --coverage-clover=coverage.clover; fi" - make -C doc SPHINXOPTS='-nW' html - make -C doc spelling