Add support for php8.4 and other improvements

.gitattributes

@@ -1,10 +1,10 @@
 * text=auto eol=lf
 
-/tests            export-ignore
-.editorconfig     export-ignore
-.gitattributes    export-ignore
-.gitignore        export-ignore
-.php_cs           export-ignore
-.travis.yml       export-ignore
-phpcs.xml.dist    export-ignore
-phpunit.xml.dist  export-ignore
+/tests               export-ignore
+.editorconfig        export-ignore
+.gitattributes       export-ignore
+.gitignore           export-ignore
+.php-cs-fixer.php    export-ignore
+phpcs.xml.dist       export-ignore
+phpunit.xml.dist     export-ignore
+.phpstan.neon        export-ignore

.github/workflows/main.yaml

@@ -1,10 +1,10 @@
 name: "testing"
 
 on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    push:
+        branches: [ master ]
+    pull_request:
+        branches: [ master ]
 
 jobs:
     qa:
@@ -13,19 +13,19 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Validate composer.json and composer.lock
               run: composer validate
 
             - name: Cache Composer packages
               id: composer-cache
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
-                path: vendor
-                key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-                restore-keys: |
-                  ${{ runner.os }}-php-
+                  path: vendor
+                  key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-php-
 
             - name: Install dependencies
               if: steps.composer-cache.outputs.cache-hit != 'true'
@@ -40,15 +40,15 @@ jobs:
 
         strategy:
             matrix:
-              php:
-                - 7.2
-                - 7.3
-                - 7.4
-                - 8.0
-                - 8.1
-                - 8.2
-                - 8.3
-                - 8.4
+                php:
+                    - 7.2
+                    - 7.3
+                    - 7.4
+                    - 8.0
+                    - 8.1
+                    - 8.2
+                    - 8.3
+                    - 8.4
 
         steps:
             - name: Checkout
@@ -71,6 +71,3 @@ jobs:
 
             - name: Tests
               run: composer test
-
-            - name: Tests coverage
-              run: composer coverage

.gitignore

@@ -2,3 +2,5 @@ vendor
 composer.lock
 coverage
 *.cache
+.idea
+kit

.php-cs-fixer.php

@@ -0,0 +1,10 @@
+<?php
+
+return My\PhpCsFixerConfig::create()
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->files()
+            ->name('*.php')
+            ->in(__DIR__.'/src')
+            ->in(__DIR__.'/tests')
+    );

.phpstan.neon

@@ -0,0 +1,10 @@
+parameters:
+    reportUnmatchedIgnoredErrors: false
+    inferPrivatePropertyTypeFromConstructor: true
+    level: 8
+    paths:
+        - src
+        - tests
+    ignoreErrors:
+        - "#expects GdImage, resource given#"
+        - "#should return resource but returns#"

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019
+Copyright (c) 2019-2025
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -20,16 +20,17 @@
     },
     "require": {
         "php": "^7.2 || ^8.0",
-        "middlewares/utils": "^3.0 || ^4.0",
-        "psr/http-server-middleware": "^1.0"
+        "middlewares/utils": "^2 || ^3 || ^4",
+        "psr/http-server-middleware": "^1",
+        "ext-gd": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8|^9",
-        "friendsofphp/php-cs-fixer": "^2.0",
-        "squizlabs/php_codesniffer": "^3.0",
-        "oscarotero/php-cs-fixer-config": "^1.0",
-        "phpstan/phpstan": "^0.12",
-        "laminas/laminas-diactoros": "^2|^3"
+        "phpunit/phpunit": "^8 || ^9",
+        "friendsofphp/php-cs-fixer": "^3",
+        "squizlabs/php_codesniffer": "^3",
+        "oscarotero/php-cs-fixer-config": "^2",
+        "phpstan/phpstan": "^1 || ^2",
+        "laminas/laminas-diactoros": "^2 || ^3"
     },
     "autoload": {
         "psr-4": {
@@ -49,4 +50,4 @@
         "coverage": "phpunit --coverage-text",
         "coverage-html": "phpunit --coverage-html=coverage"
     }
-}
+}

phpcs.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<ruleset name="Middlewares coding standard">
+    <description>Middlewares coding standard</description>
+
+    <!-- display progress -->
+    <arg value="p"/>
+    <arg name="report" value="full"/>
+    <arg name="colors"/>
+
+    <!-- coding standard -->
+    <rule ref="PSR2"/>
+
+    <!-- Paths to check -->
+    <file>src</file>
+    <file>tests</file>
+</ruleset>

phpunit.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         colors="true"
+         verbose="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         failOnWarning="true">
+    <testsuites>
+        <testsuite name="ErrorHandler test suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
+            <directory>./src</directory>
+            <exclude>
+                <directory>./tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-text" target="php://stdout"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <log type="coverage-html" target="build/coverage"/>
+    </logging>
+</phpunit>

src/ErrorFormatter/AbstractFormatter.php

@@ -23,8 +23,8 @@ abstract class AbstractFormatter implements FormatterInterface
     protected $contentTypes = [];
 
     public function __construct(
-        ResponseFactoryInterface $responseFactory = null,
-        StreamFactoryInterface $streamFactory = null
+        ?ResponseFactoryInterface $responseFactory = null,
+        ?StreamFactoryInterface $streamFactory = null
     ) {
         $this->responseFactory = $responseFactory ?? Factory::getResponseFactory();
         $this->streamFactory = $streamFactory ?? Factory::getStreamFactory();

src/ErrorFormatter/ImageFormatter.php

@@ -51,9 +51,13 @@ private function createImage(Throwable $error)
         $size = 200;
         $image = imagecreatetruecolor($size, $size);
         $textColor = imagecolorallocate($image, 255, 255, 255);
+
+        /* @phpstan-ignore-next-line */
         imagestring($image, 5, 10, 10, "$type $code", $textColor);
 
+        /* @phpstan-ignore-next-line */
         foreach (str_split($message, intval($size / 10)) as $line => $text) {
+            /* @phpstan-ignore-next-line */
             imagestring($image, 5, 10, ($line * 18) + 28, $text, $textColor);
         }
 

src/ErrorHandler.php

@@ -4,6 +4,12 @@
 namespace Middlewares;
 
 use Middlewares\ErrorFormatter\FormatterInterface;
+use Middlewares\ErrorFormatter\HtmlFormatter;
+use Middlewares\ErrorFormatter\ImageFormatter;
+use Middlewares\ErrorFormatter\JsonFormatter;
+use Middlewares\ErrorFormatter\PlainFormatter;
+use Middlewares\ErrorFormatter\SvgFormatter;
+use Middlewares\ErrorFormatter\XmlFormatter;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
@@ -20,16 +26,16 @@ class ErrorHandler implements MiddlewareInterface
      *
      * @param FormatterInterface[] $formatters
      */
-    public function __construct(array $formatters = null)
+    public function __construct(?array $formatters = null)
     {
         if (empty($formatters)) {
             $formatters = [
-                new ErrorFormatter\PlainFormatter(),
-                new ErrorFormatter\HtmlFormatter(),
-                new ErrorFormatter\ImageFormatter(),
-                new ErrorFormatter\JsonFormatter(),
-                new ErrorFormatter\SvgFormatter(),
-                new ErrorFormatter\XmlFormatter(),
+                new PlainFormatter(),
+                new HtmlFormatter(),
+                new ImageFormatter(),
+                new JsonFormatter(),
+                new SvgFormatter(),
+                new XmlFormatter(),
             ];
         }
 
@@ -59,6 +65,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 }
             }
 
+            /** @var FormatterInterface $default */
             $default = reset($this->formatters);
 
             return $default->handle($error, $request);