From e832d4f1511200b550b967c458468165bbbec4a1 Mon Sep 17 00:00:00 2001 From: fernando Date: Tue, 30 Jul 2024 14:55:03 +1000 Subject: [PATCH 1/2] feat: supporting new version of guzzle-promises --- composer.json | 3 ++- src/LogMiddleware.php | 6 +++--- tests/AbstractLoggerMiddlewareTest.php | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 79ec4d8..a97281f 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "gmponos/guzzle_logger", + "name": "covergenius/guzzle_logger", "description": "A Guzzle middleware to log request and responses automatically", "keywords": [ "psr3", @@ -33,6 +33,7 @@ "psr/log": "^1.1 || ^2.0 || ^3.0" }, "require-dev": { + "colinodell/psr-testlogger": "^1.3", "phpstan/phpstan": "~0.12.32", "phpstan/phpstan-phpunit": "^0.12.11", "phpstan/phpstan-strict-rules": "^0.12.2", diff --git a/src/LogMiddleware.php b/src/LogMiddleware.php index 0e54e47..3f3e635 100644 --- a/src/LogMiddleware.php +++ b/src/LogMiddleware.php @@ -109,14 +109,14 @@ private function handleSuccess(RequestInterface $request, array $options): calla */ private function handleFailure(RequestInterface $request, array $options): callable { - return function (\Exception $reason) use ($request, $options) { + return function ($reason) use ($request, $options) { if ($reason instanceof RequestException && $reason->hasResponse() === true) { $this->handler->log($this->logger, $request, $reason->getResponse(), $reason, $this->stats, $options); - return \GuzzleHttp\Promise\rejection_for($reason); + return \GuzzleHttp\Promise\Create::rejectionFor($reason); } $this->handler->log($this->logger, $request, null, $reason, $this->stats, $options); - return \GuzzleHttp\Promise\rejection_for($reason); + return \GuzzleHttp\Promise\Create::rejectionFor($reason); }; } diff --git a/tests/AbstractLoggerMiddlewareTest.php b/tests/AbstractLoggerMiddlewareTest.php index 3017258..704c985 100644 --- a/tests/AbstractLoggerMiddlewareTest.php +++ b/tests/AbstractLoggerMiddlewareTest.php @@ -15,7 +15,7 @@ use PHPUnit\Framework\TestCase; use Psr\Http\Message\RequestInterface; use Psr\Http\Message\ResponseInterface; -use Psr\Log\Test\TestLogger; +use ColinODell\PsrTestLogger\TestLogger; abstract class AbstractLoggerMiddlewareTest extends TestCase { From 08a16c11ecf1d733a8ca0a2f005f32ff8cad6ce0 Mon Sep 17 00:00:00 2001 From: fernando Date: Tue, 30 Jul 2024 16:01:09 +1000 Subject: [PATCH 2/2] feat: promises guzzle dependency --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a97281f..eb4105e 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "logging" ], "license": "MIT", - "homepage": "https://github.com/gmponos/guzzle-log-middleware", + "homepage": "https://github.com/covergenius/guzzle-log-middleware", "authors": [ { "name": "George Mponos", @@ -29,6 +29,7 @@ "php": "^7.2 || ^8.0", "ext-json": "*", "guzzlehttp/guzzle": "^6.1 || ^7.0.1", + "guzzlehttp/promises": "^2", "guzzlehttp/psr7": "^1.7 || ^2.0", "psr/log": "^1.1 || ^2.0 || ^3.0" },