From 277047abb61fbcc4d807ee788ef4c75b76b4589f Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 28 Dec 2018 11:38:55 +0100 Subject: [PATCH 1/6] Support both client-common ^1.9 and 2.x --- composer.json | 4 ++-- src/LoggerPlugin.php | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 8abfcf0..ac6ac8d 100644 --- a/composer.json +++ b/composer.json @@ -11,9 +11,9 @@ } ], "require": { - "php": ">=5.4", + "php": "^5.4 || ^7.0", "psr/log": "^1.0", - "php-http/client-common": "^1.1", + "php-http/client-common": "^1.9 || ^2.0", "php-http/message": "^1.0" }, "require-dev": { diff --git a/src/LoggerPlugin.php b/src/LoggerPlugin.php index 1797d7f..426a9b3 100644 --- a/src/LoggerPlugin.php +++ b/src/LoggerPlugin.php @@ -15,7 +15,7 @@ * * @author Joel Wurtz */ -final class LoggerPlugin implements Plugin +final class LoggerPlugin extends VersionBridgePlugin { private $logger; @@ -27,10 +27,7 @@ public function __construct(LoggerInterface $logger, Formatter $formatter = null $this->formatter = $formatter ?: new SimpleFormatter(); } - /** - * {@inheritdoc} - */ - public function handleRequest(RequestInterface $request, callable $next, callable $first) + protected function doHandleRequest(RequestInterface $request, callable $next, callable $first) { $start = microtime(true); $this->logger->info(sprintf("Sending request:\n%s", $this->formatter->formatRequest($request)), ['request' => $request]); From 5f47e542d9555060d8749cad9604c1478b41e99c Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 28 Dec 2018 11:49:39 +0100 Subject: [PATCH 2/6] minors --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ac6ac8d..9c69086 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "prefer-stable": true, From ddae965e550e2386a3037f99236bfd669904f786 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 29 Dec 2018 08:50:48 +0100 Subject: [PATCH 3/6] Use Traits --- src/LoggerPlugin.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/LoggerPlugin.php b/src/LoggerPlugin.php index 426a9b3..c822cbc 100644 --- a/src/LoggerPlugin.php +++ b/src/LoggerPlugin.php @@ -15,8 +15,10 @@ * * @author Joel Wurtz */ -final class LoggerPlugin extends VersionBridgePlugin +final class LoggerPlugin implements Plugin { + use VersionBridgePlugin; + private $logger; private $formatter; From 8b06fac9b518de92687767dc4c9f3b65e0539060 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 29 Dec 2018 11:58:01 +0100 Subject: [PATCH 4/6] Make sure we test with both 2.0 and 1.9 of client-common --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dad7ea5..4c6b223 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,11 @@ matrix: include: - php: 5.4 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" + - php: 7.2 + env: DEPENDENCIES="php-http/client-common:^1.9" before_install: - - travis_retry composer self-update + - if ! [ -z "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi; install: - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction From 90418c9247c318f5061832538003625743960d2b Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 29 Dec 2018 14:21:10 +0100 Subject: [PATCH 5/6] No need to have special test for client-common:1.9 That is already tested in prefer-lowest --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c6b223..c606b60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,13 +29,10 @@ matrix: - php: 5.4 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" - php: 7.2 - env: DEPENDENCIES="php-http/client-common:^1.9" - -before_install: - - if ! [ -z "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi; + env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" install: - - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction + - composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction script: - $TEST_COMMAND From 31db633fa6e8acc43918ab3cec0b9357def3b7a5 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 29 Dec 2018 14:37:12 +0100 Subject: [PATCH 6/6] Run test on php7.1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c606b60..2d2dc53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ matrix: include: - php: 5.4 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" - - php: 7.2 + - php: 7.1 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" install: