added PHP 8.0|8.1 support

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": {

src/Formatter/ZendDiactorosToArrayMessageFormatter.php → 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
     {

src/Formatter/ZendDiactorosToStringMessageFormatter.php → 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
     {

test/Formatter/LaminasDiactorosToArrayMessageFormatterTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpMiddlewareTest\LogHttpMessages\Formatter;
+
+use PHPUnit\Framework\TestCase;
+use PhpMiddleware\LogHttpMessages\Formatter\LaminasDiactorosToArrayMessageFormatter;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\ServerRequest;
+
+class LaminasDiactorosToArrayMessageFormatterTest extends TestCase
+{
+    public function testFormatRequestToArray()
+    {
+        $request = new ServerRequest();
+        $formatter = new LaminasDiactorosToArrayMessageFormatter();
+
+        $formattedMessage = $formatter->formatServerRequest($request);
+
+        $this->assertIsArray($formattedMessage->getValue());
+    }
+
+    public function testFormatResponeToArray()
+    {
+        $response = new Response();
+        $formatter = new LaminasDiactorosToArrayMessageFormatter();
+
+        $formattedMessage = $formatter->formatResponse($response);
+
+        $this->assertIsArray($formattedMessage->getValue());
+    }
+}

test/Formatter/LaminasDiactorosToStringMessageFormatterTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpMiddlewareTest\LogHttpMessages\Formatter;
+
+use PhpMiddleware\LogHttpMessages\Formatter\LaminasDiactorosToStringMessageFormatter;
+use PHPUnit\Framework\TestCase;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\ServerRequest;
+
+class LaminasDiactorosToStringMessageFormatterTest extends TestCase
+{
+    public function testFormatRequestToArray()
+    {
+        $request = new ServerRequest();
+        $formatter = new LaminasDiactorosToStringMessageFormatter();
+
+        $formattedMessage = $formatter->formatServerRequest($request);
+
+        $this->assertIsString($formattedMessage->getValue());
+    }
+
+    public function testFormatResponeToArray()
+    {
+        $response = new Response();
+        $formatter = new LaminasDiactorosToStringMessageFormatter();
+
+        $formattedMessage = $formatter->formatResponse($response);
+
+        $this->assertIsString($formattedMessage->getValue());
+    }
+}

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);