Add support for PHP 8.0

Author: devanych

.github/workflows/build.yml

@@ -66,14 +66,17 @@ jobs:
             -   name: PHPCS check
                 run: vendor/bin/phpcs
 
-            -   name: Psalm static analysis on PHP 7.4
-                if: matrix.php-version == '7.4'
+            -   name: Psalm static analysis
                 run: vendor/bin/psalm --no-progress
 
-            -   name: PHPUnit run on PHP 7.4
+            -   name: PHPUnit run with coverage on PHP 7.4
                 if: matrix.php-version == '7.4'
                 run: vendor/bin/phpunit --coverage-clover=coverage.clover
 
+            -   name: PHPUnit run without coverage on PHP 8.0
+                if: matrix.php-version == '8.0'
+                run: vendor/bin/phpunit
+
             -   name: Code coverage on PHP 7.4
                 if: matrix.php-version == '7.4'
                 run: |

composer.json

@@ -19,17 +19,17 @@
         "docs": "https://httpsoft.org/docs/error-handler"
     },
     "require": {
-        "php": "^7.4",
+        "php": "^7.4|^8.0",
         "httpsoft/http-response": "^1.0",
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
         "httpsoft/http-request": "^1.0",
-        "phpunit/phpunit": "^9.1",
+        "phpunit/phpunit": "^9.3",
         "squizlabs/php_codesniffer": "^3.5",
-        "vimeo/psalm": "^3.12"
+        "vimeo/psalm": "^3.14"
     },
     "autoload": {
         "psr-4": {

tests/ErrorHandlerMiddlewareTest.php

@@ -21,6 +21,7 @@
 
 use const E_ERROR;
 use const E_NOTICE;
+use const E_WARNING;
 
 class ErrorHandlerMiddlewareTest extends TestCase implements ResponseStatusCodeInterface
 {
@@ -116,7 +117,10 @@ public function testWithErrorRequestHandlerAndWithoutCaughtError(): void
 
     public function testWithErrorRequestHandlerAndWithCaughtError(): void
     {
-        $response = $this->errorHandler->process($this->request, $this->createErrorRequestHandler(E_NOTICE));
+        $response = $this->errorHandler->process(
+            $this->request,
+            $this->createErrorRequestHandler(E_NOTICE | E_WARNING)
+        );
         $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertSame(self::STATUS_INTERNAL_SERVER_ERROR, $response->getStatusCode());
         $this->assertSame(self::PHRASES[self::STATUS_INTERNAL_SERVER_ERROR], $response->getReasonPhrase());
@@ -154,7 +158,10 @@ public function testWithErrorRequestHandlerAndWithAdditionOfListeners(): void
     {
         $this->errorHandler->addListener($firstListener = new FirstErrorListener());
         $this->errorHandler->addListener($secondListener = new SecondErrorListener());
-        $response = $this->errorHandler->process($this->request, $this->createErrorRequestHandler(E_NOTICE));
+        $response = $this->errorHandler->process(
+            $this->request,
+            $this->createErrorRequestHandler(E_NOTICE | E_WARNING)
+        );
 
         $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertSame(self::STATUS_INTERNAL_SERVER_ERROR, $response->getStatusCode());

tests/ErrorHandlerTest.php

@@ -21,6 +21,7 @@
 
 use const E_ERROR;
 use const E_NOTICE;
+use const E_WARNING;
 
 class ErrorHandlerTest extends TestCase implements ResponseStatusCodeInterface
 {
@@ -111,7 +112,7 @@ public function testWithErrorRequestHandlerAndWithoutCaughtError(): void
 
     public function testWithErrorRequestHandlerAndWithCaughtError(): void
     {
-        $errorHandler = $this->createWithErrorRequestHandler(E_NOTICE);
+        $errorHandler = $this->createWithErrorRequestHandler(E_NOTICE | E_WARNING);
         $response = $errorHandler->handle($this->request);
         $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertSame(self::STATUS_INTERNAL_SERVER_ERROR, $response->getStatusCode());
@@ -150,7 +151,7 @@ public function testWithThrowableRequestHandlerAndWithAdditionOfListeners(): voi
 
     public function testWithErrorRequestHandlerAndWithAdditionOfListeners(): void
     {
-        $errorHandler = $this->createWithErrorRequestHandler(E_NOTICE);
+        $errorHandler = $this->createWithErrorRequestHandler(E_NOTICE | E_WARNING);
         $errorHandler->addListener($firstListener = new FirstErrorListener());
         $errorHandler->addListener($secondListener = new SecondErrorListener());
         $response = $errorHandler->handle($this->request);

tests/TestAsset/ErrorRequestHandler.php

@@ -19,7 +19,8 @@ class ErrorRequestHandler implements RequestHandlerInterface
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $variable = $undefined;
+        $array = [];
+        $array['undefined'];
         return ResponseFactory::create();
     }
 }