From 8d167557cfac74202100e4d9430d5298c873a023 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 28 Dec 2018 11:38:55 +0100 Subject: [PATCH 1/7] Support both client-common ^1.9 and 2.x --- .travis.yml | 1 + composer.json | 4 ++-- src/StopwatchPlugin.php | 7 ++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf50516..81e8617 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ matrix: - php: 7.1 - php: 7.2 env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="henrikbjorn/phpspec-code-coverage:^1.0" + - php: 7.3 # Force some major versions of Symfony - php: 7.2 diff --git a/composer.json b/composer.json index 76424fb..495c17b 100644 --- a/composer.json +++ b/composer.json @@ -11,9 +11,9 @@ } ], "require": { - "php": ">=5.4", + "php": ">^5.4 || ^7.0", "symfony/stopwatch": "^2.7|^3.0|^4.0", - "php-http/client-common": "^1.1" + "php-http/client-common": "^1.9 || ^2.0" }, "require-dev": { "phpspec/phpspec": "^2.5 || ^3.0 || ^4.0" diff --git a/src/StopwatchPlugin.php b/src/StopwatchPlugin.php index 8e3054a..7208c08 100644 --- a/src/StopwatchPlugin.php +++ b/src/StopwatchPlugin.php @@ -13,7 +13,7 @@ * * @author Joel Wurtz */ -final class StopwatchPlugin implements Plugin +final class StopwatchPlugin extends VersionBridgePlugin { const CATEGORY = 'php_http.request'; @@ -30,10 +30,7 @@ public function __construct(Stopwatch $stopwatch) $this->stopwatch = $stopwatch; } - /** - * {@inheritdoc} - */ - public function handleRequest(RequestInterface $request, callable $next, callable $first) + protected function doHandleRequest(RequestInterface $request, callable $next, callable $first) { $eventName = $this->getStopwatchEventName($request); $this->stopwatch->start($eventName, self::CATEGORY); From 529b9a3821ba2e3624e4bbdf6a52f521128fec22 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 28 Dec 2018 11:48:10 +0100 Subject: [PATCH 2/7] Typo --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 495c17b..62bfa87 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": ">^5.4 || ^7.0", + "php": "^5.4 || ^7.0", "symfony/stopwatch": "^2.7|^3.0|^4.0", "php-http/client-common": "^1.9 || ^2.0" }, From dcbdef631c71800bfe3c931f0e6afc50588de702 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 28 Dec 2018 11:49:39 +0100 Subject: [PATCH 3/7] minors --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 62bfa87..7392322 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": "^5.4 || ^7.0", - "symfony/stopwatch": "^2.7|^3.0|^4.0", + "symfony/stopwatch": "^2.7 || ^3.0 || ^4.0", "php-http/client-common": "^1.9 || ^2.0" }, "require-dev": { @@ -29,7 +29,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.2-dev" } }, "prefer-stable": true, From 1d4755d3a14637cf908ce61e706e2b7d20c295e6 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 29 Dec 2018 08:50:48 +0100 Subject: [PATCH 4/7] Use Traits --- src/StopwatchPlugin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/StopwatchPlugin.php b/src/StopwatchPlugin.php index 7208c08..75e0101 100644 --- a/src/StopwatchPlugin.php +++ b/src/StopwatchPlugin.php @@ -13,9 +13,10 @@ * * @author Joel Wurtz */ -final class StopwatchPlugin extends VersionBridgePlugin +final class StopwatchPlugin implements Plugin { const CATEGORY = 'php_http.request'; + use VersionBridgePlugin; /** * @var Stopwatch From d51df838dc1bb7f7e1cdbc66d879211f514fda23 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 29 Dec 2018 11:53:05 +0100 Subject: [PATCH 5/7] cs --- src/StopwatchPlugin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/StopwatchPlugin.php b/src/StopwatchPlugin.php index 75e0101..5e574a5 100644 --- a/src/StopwatchPlugin.php +++ b/src/StopwatchPlugin.php @@ -16,6 +16,7 @@ final class StopwatchPlugin implements Plugin { const CATEGORY = 'php_http.request'; + use VersionBridgePlugin; /** From d4b0d53a855175f4fabe803206991fdabdfd8e59 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 29 Dec 2018 11:58:01 +0100 Subject: [PATCH 6/7] Make sure we test with both 2.0 and 1.9 of client-common --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 81e8617..42cb1b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,9 @@ matrix: - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^4" + - php: 7.2 + env: DEPENDENCIES="php-http/client-common:^1.9" + # Latest commit to master - php: 7.2 env: STABILITY="dev" From fee3ea8d5a3176af10ada9377683750ba5c54ec2 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 29 Dec 2018 14:21:10 +0100 Subject: [PATCH 7/7] No need to have special test for client-common:1.9 That is already tested in prefer-lowest --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42cb1b0..81e8617 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,9 +40,6 @@ matrix: - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^4" - - php: 7.2 - env: DEPENDENCIES="php-http/client-common:^1.9" - # Latest commit to master - php: 7.2 env: STABILITY="dev"