From 5fc1e59da8611a293e031d462e78fc255f0da882 Mon Sep 17 00:00:00 2001 From: Dariusz Korsak Date: Fri, 28 Oct 2022 10:31:23 +0200 Subject: [PATCH 1/2] changed dependency from zend diactoros to laminas diactoros --- .phpunit.result.cache | 1 + composer.json | 6 ++-- ...minasDiactorosToArrayMessageFormatter.php} | 6 ++-- ...inasDiactorosToStringMessageFormatter.php} | 6 ++-- ...asDiactorosToArrayMessageFormatterTest.php | 31 +++++++++++++++++++ ...sDiactorosToStringMessageFormatterTest.php | 31 +++++++++++++++++++ ...ndDiactorosToArrayMessageFormatterTest.php | 31 ------------------- ...dDiactorosToStringMessageFormatterTest.php | 31 ------------------- test/LogMiddlewareTest.php | 2 +- 9 files changed, 73 insertions(+), 72 deletions(-) create mode 100644 .phpunit.result.cache rename src/Formatter/{ZendDiactorosToArrayMessageFormatter.php => LaminasDiactorosToArrayMessageFormatter.php} (70%) rename src/Formatter/{ZendDiactorosToStringMessageFormatter.php => LaminasDiactorosToStringMessageFormatter.php} (71%) create mode 100644 test/Formatter/LaminasDiactorosToArrayMessageFormatterTest.php create mode 100644 test/Formatter/LaminasDiactorosToStringMessageFormatterTest.php delete mode 100644 test/Formatter/ZendDiactorosToArrayMessageFormatterTest.php delete mode 100644 test/Formatter/ZendDiactorosToStringMessageFormatterTest.php diff --git a/.phpunit.result.cache b/.phpunit.result.cache new file mode 100644 index 0000000..98c41e6 --- /dev/null +++ b/.phpunit.result.cache @@ -0,0 +1 @@ +{"version":1,"defects":[],"times":{"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\FormattedMessageTest::testCanCreateFromString":0.001,"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\FormattedMessageTest::testCanCreateFromArray":0,"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\FormattedMessageTest::testCanCreateEmpty":0,"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\LaminasDiactorosToArrayMessageFormatterTest::testFormatRequestToArray":0.002,"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\LaminasDiactorosToArrayMessageFormatterTest::testFormatResponeToArray":0,"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\LaminasDiactorosToStringMessageFormatterTest::testFormatRequestToArray":0,"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\LaminasDiactorosToStringMessageFormatterTest::testFormatResponeToArray":0,"PhpMiddlewareTest\\LogHttpMessages\\LogMiddlewareTest::testLogFormattedMessages":0.006}} \ No newline at end of file diff --git a/composer.json b/composer.json index 813df82..e7dedaf 100644 --- a/composer.json +++ b/composer.json @@ -13,15 +13,15 @@ "psr-3" ], "require": { - "php": ">=7.0", + "php": ">=7.4", "psr/log": "^1.0", "psr/http-message": "^1.0", "psr/http-server-handler": "^1.0", "psr/http-server-middleware": "^1.0", - "zendframework/zend-diactoros": "^1.4 || ^2.0" + "laminas/laminas-diactoros": "^1.4 || ^2.0" }, "require-dev": { - "phpunit/phpunit": "^6.1" + "phpunit/phpunit": "^8.0" }, "autoload": { "psr-4": { diff --git a/src/Formatter/ZendDiactorosToArrayMessageFormatter.php b/src/Formatter/LaminasDiactorosToArrayMessageFormatter.php similarity index 70% rename from src/Formatter/ZendDiactorosToArrayMessageFormatter.php rename to src/Formatter/LaminasDiactorosToArrayMessageFormatter.php index b6bc9be..9d6c8a1 100644 --- a/src/Formatter/ZendDiactorosToArrayMessageFormatter.php +++ b/src/Formatter/LaminasDiactorosToArrayMessageFormatter.php @@ -6,10 +6,10 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; -use Zend\Diactoros\Response\ArraySerializer as ResponseSerializer; -use Zend\Diactoros\Request\ArraySerializer as RequestSerializer; +use Laminas\Diactoros\Response\ArraySerializer as ResponseSerializer; +use Laminas\Diactoros\Request\ArraySerializer as RequestSerializer; -final class ZendDiactorosToArrayMessageFormatter implements ServerRequestFormatter, ResponseFormatter +final class LaminasDiactorosToArrayMessageFormatter implements ServerRequestFormatter, ResponseFormatter { public function formatResponse(ResponseInterface $response): FormattedMessage { diff --git a/src/Formatter/ZendDiactorosToStringMessageFormatter.php b/src/Formatter/LaminasDiactorosToStringMessageFormatter.php similarity index 71% rename from src/Formatter/ZendDiactorosToStringMessageFormatter.php rename to src/Formatter/LaminasDiactorosToStringMessageFormatter.php index 3468a8f..53cd59b 100644 --- a/src/Formatter/ZendDiactorosToStringMessageFormatter.php +++ b/src/Formatter/LaminasDiactorosToStringMessageFormatter.php @@ -6,10 +6,10 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; -use Zend\Diactoros\Response\Serializer as ResponseSerializer; -use Zend\Diactoros\Request\Serializer as RequestSerializer; +use Laminas\Diactoros\Response\Serializer as ResponseSerializer; +use Laminas\Diactoros\Request\Serializer as RequestSerializer; -final class ZendDiactorosToStringMessageFormatter implements ServerRequestFormatter, ResponseFormatter +final class LaminasDiactorosToStringMessageFormatter implements ServerRequestFormatter, ResponseFormatter { public function formatResponse(ResponseInterface $response): FormattedMessage { diff --git a/test/Formatter/LaminasDiactorosToArrayMessageFormatterTest.php b/test/Formatter/LaminasDiactorosToArrayMessageFormatterTest.php new file mode 100644 index 0000000..a5ba99b --- /dev/null +++ b/test/Formatter/LaminasDiactorosToArrayMessageFormatterTest.php @@ -0,0 +1,31 @@ +formatServerRequest($request); + + $this->assertIsArray($formattedMessage->getValue()); + } + + public function testFormatResponeToArray() + { + $response = new Response(); + $formatter = new LaminasDiactorosToArrayMessageFormatter(); + + $formattedMessage = $formatter->formatResponse($response); + + $this->assertIsArray($formattedMessage->getValue()); + } +} diff --git a/test/Formatter/LaminasDiactorosToStringMessageFormatterTest.php b/test/Formatter/LaminasDiactorosToStringMessageFormatterTest.php new file mode 100644 index 0000000..5f7c38f --- /dev/null +++ b/test/Formatter/LaminasDiactorosToStringMessageFormatterTest.php @@ -0,0 +1,31 @@ +formatServerRequest($request); + + $this->assertIsString($formattedMessage->getValue()); + } + + public function testFormatResponeToArray() + { + $response = new Response(); + $formatter = new LaminasDiactorosToStringMessageFormatter(); + + $formattedMessage = $formatter->formatResponse($response); + + $this->assertIsString($formattedMessage->getValue()); + } +} diff --git a/test/Formatter/ZendDiactorosToArrayMessageFormatterTest.php b/test/Formatter/ZendDiactorosToArrayMessageFormatterTest.php deleted file mode 100644 index 722ae5d..0000000 --- a/test/Formatter/ZendDiactorosToArrayMessageFormatterTest.php +++ /dev/null @@ -1,31 +0,0 @@ -formatServerRequest($request); - - $this->assertInternalType('array', $formattedMessage->getValue()); - } - - public function testFormatResponeToArray() - { - $response = new Response(); - $formatter = new ZendDiactorosToArrayMessageFormatter(); - - $formattedMessage = $formatter->formatResponse($response); - - $this->assertInternalType('array', $formattedMessage->getValue()); - } -} diff --git a/test/Formatter/ZendDiactorosToStringMessageFormatterTest.php b/test/Formatter/ZendDiactorosToStringMessageFormatterTest.php deleted file mode 100644 index 3c4c511..0000000 --- a/test/Formatter/ZendDiactorosToStringMessageFormatterTest.php +++ /dev/null @@ -1,31 +0,0 @@ -formatServerRequest($request); - - $this->assertInternalType('string', $formattedMessage->getValue()); - } - - public function testFormatResponeToArray() - { - $response = new Response(); - $formatter = new ZendDiactorosToStringMessageFormatter(); - - $formattedMessage = $formatter->formatResponse($response); - - $this->assertInternalType('string', $formattedMessage->getValue()); - } -} diff --git a/test/LogMiddlewareTest.php b/test/LogMiddlewareTest.php index cf0596a..fb17577 100644 --- a/test/LogMiddlewareTest.php +++ b/test/LogMiddlewareTest.php @@ -20,7 +20,7 @@ class LogMiddlewareTest extends TestCase private $logger; private $handler; - protected function setUp() + protected function setUp(): void { $response = $this->createMock(ResponseInterface::class); From 39fe511ab438c4dc74638e3f68438b3bc740717e Mon Sep 17 00:00:00 2001 From: Dariusz Korsak Date: Fri, 28 Oct 2022 10:36:50 +0200 Subject: [PATCH 2/2] removed .phpunit.result.cache --- .phpunit.result.cache | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .phpunit.result.cache diff --git a/.phpunit.result.cache b/.phpunit.result.cache deleted file mode 100644 index 98c41e6..0000000 --- a/.phpunit.result.cache +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"defects":[],"times":{"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\FormattedMessageTest::testCanCreateFromString":0.001,"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\FormattedMessageTest::testCanCreateFromArray":0,"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\FormattedMessageTest::testCanCreateEmpty":0,"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\LaminasDiactorosToArrayMessageFormatterTest::testFormatRequestToArray":0.002,"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\LaminasDiactorosToArrayMessageFormatterTest::testFormatResponeToArray":0,"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\LaminasDiactorosToStringMessageFormatterTest::testFormatRequestToArray":0,"PhpMiddlewareTest\\LogHttpMessages\\Formatter\\LaminasDiactorosToStringMessageFormatterTest::testFormatResponeToArray":0,"PhpMiddlewareTest\\LogHttpMessages\\LogMiddlewareTest::testLogFormattedMessages":0.006}} \ No newline at end of file