php85

Author: dominikzogg

.github/workflows/ci.yml

@@ -6,36 +6,36 @@ on:
     - cron: "0 0 * * *"
 
 jobs:
-  php82:
-    name: PHP 8.2
+  php83:
+    name: PHP 8.3
     runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: composer test
-        uses: docker://ghcr.io/chubbyphp/ci-php82:latest
+        uses: docker://ghcr.io/chubbyphp/ci-php83:latest
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
-  php83:
-    name: PHP 8.3
+  php84:
+    name: PHP 8.4
     runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: composer test
-        uses: docker://ghcr.io/chubbyphp/ci-php83:latest
+        uses: docker://ghcr.io/chubbyphp/ci-php84:latest
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
-  php84:
-    name: PHP 8.4
+  php85:
+    name: PHP 8.5
     runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: composer test
-        uses: docker://ghcr.io/chubbyphp/ci-php84:latest
+        uses: docker://ghcr.io/chubbyphp/ci-php85:latest
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.php-cs-fixer.php

@@ -13,6 +13,7 @@
 $config = require __DIR__ . '/vendor/chubbyphp/chubbyphp-dev-helper/phpcs.php';
 
 return (new PhpCsFixer\Config)
+    ->setUnsupportedPhpVersionAllowed(true)
     ->setIndent($config['indent'])
     ->setLineEnding($config['lineEnding'])
     ->setRules($config['rules'])

README.md

@@ -36,7 +36,7 @@ A minimal, highly [performant][1] middleware [PSR-15][8] microframework built wi
 
 ## Requirements
 
- * php: ^8.2
+ * php: ^8.3
  * [chubbyphp/chubbyphp-http-exception][20]: ^1.2
  * [psr/container][21]: ^1.1.2|^2.0.2
  * [psr/http-factory-implementation][22]: ^1.0
@@ -53,7 +53,9 @@ A minimal, highly [performant][1] middleware [PSR-15][8] microframework built wi
 
 Any Router which implements `Chubbyphp\Framework\Router\RouteMatcherInterface` can be used.
 
- * [chubbyphp/chubbyphp-framework-router-fastroute][30]: ^2.1
+ * [chubbyphp/chubbyphp-framework-router-fastroute][30]: ^2.3
+ * [chubbyphp/chubbyphp-framework-router-symfony][31]: ^2.3
+
 ### PSR 7 / PSR 17
 
  * [guzzlehttp/psr7][40]: ^2.7 (with [http-interop/http-factory-guzzle][41]: ^1.2)
@@ -67,8 +69,8 @@ Any Router which implements `Chubbyphp\Framework\Router\RouteMatcherInterface` c
 Through [Composer](http://getcomposer.org) as [chubbyphp/chubbyphp-framework][60].
 
 ```bash
-composer require chubbyphp/chubbyphp-framework "^5.2" \
-    chubbyphp/chubbyphp-framework-router-fastroute "^2.1" \
+composer require chubbyphp/chubbyphp-framework "^5.3" \
+    chubbyphp/chubbyphp-framework-router-fastroute "^2.3" \
     slim/psr7 "^1.7"
 ```
 
@@ -190,6 +192,7 @@ $app->emit($app->handle((new ServerRequestFactory())->createFromGlobals()));
 [28]: https://packagist.org/packages/psr/log
 
 [30]: https://github.com/chubbyphp/chubbyphp-framework-router-fastroute#usage
+[31]: https://github.com/chubbyphp/chubbyphp-framework-router-symfony#usage
 
 [40]: https://packagist.org/packages/guzzlehttp/psr7
 [41]: https://packagist.org/packages/http-interop/http-factory-guzzle

composer.json

@@ -22,7 +22,7 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "chubbyphp/chubbyphp-http-exception": "^1.2",
         "psr/container": "^1.1.2|^2.0.2",
         "psr/http-factory-implementation": "^1.0",
@@ -35,18 +35,18 @@
     },
     "require-dev": {
         "chubbyphp/chubbyphp-dev-helper": "dev-master",
-        "chubbyphp/chubbyphp-mock": "^2.0",
-        "guzzlehttp/psr7": "^2.7",
+        "chubbyphp/chubbyphp-mock": "^2.0.1",
+        "guzzlehttp/psr7": "^2.8",
         "http-interop/http-factory-guzzle": "^1.2",
-        "infection/infection": "^0.29.13",
-        "laminas/laminas-diactoros": "^3.5",
+        "infection/infection": "^0.31.9",
+        "laminas/laminas-diactoros": "^3.8",
         "nyholm/psr7": "^1.8.2",
-        "php-coveralls/php-coveralls": "^2.7.0",
+        "php-coveralls/php-coveralls": "^2.9",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.1.6",
-        "phpunit/phpunit": "^11.5.10",
-        "slim/psr7": "^1.7",
-        "sunrise/http-message": "^3.4.2"
+        "phpstan/phpstan": "^2.1.32",
+        "phpunit/phpunit": "^12.4.5",
+        "slim/psr7": "^1.8",
+        "sunrise/http-message": "^3.7"
     },
     "autoload": {
         "psr-4": { "Chubbyphp\\Framework\\": "src/" }
@@ -63,11 +63,11 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.2-dev"
+            "dev-master": "5.3-dev"
         }
     },
     "scripts": {
-        "fix:cs": "mkdir -p build && PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --cache-file=build/phpcs.cache",
+        "fix:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --cache-file=build/phpcs.cache",
         "test": [
             "@test:lint",
             "@test:unit",
@@ -76,7 +76,7 @@
             "@test:static-analysis",
             "@test:cs"
         ],
-        "test:cs": "mkdir -p build && PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
+        "test:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
         "test:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=100 --verbose --coverage=build/phpunit",
         "test:integration": "vendor/bin/phpunit --testsuite=Integration --cache-directory=build/phpunit",
         "test:lint": "mkdir -p build && find src tests -name '*.php' -print0 | xargs -0 -n1 -P$(nproc) php -l | tee build/phplint.log",

src/Middleware/ExceptionMiddleware.php

@@ -16,7 +16,7 @@
 
 final class ExceptionMiddleware implements MiddlewareInterface
 {
-    private const HTML = <<<'EOT'
+    private const string HTML = <<<'EOT'
         <!DOCTYPE html>
         <html>
             <head>

src/Middleware/SlimCallbackMiddleware.php

@@ -12,7 +12,7 @@
 
 final class SlimCallbackMiddleware implements MiddlewareInterface
 {
-    private const ATTRIBUTE_RESPONSE = 'response';
+    private const string ATTRIBUTE_RESPONSE = 'response';
 
     /**
      * @var callable

src/RequestHandler/SlimCallbackRequestHandler.php

@@ -11,7 +11,7 @@
 
 final class SlimCallbackRequestHandler implements RequestHandlerInterface
 {
-    private const ATTRIBUTE_RESPONSE = 'response';
+    private const string ATTRIBUTE_RESPONSE = 'response';
 
     /**
      * @var callable

tests/Integration/RouteMatcherLessTest.php

@@ -13,6 +13,7 @@
 use Laminas\Diactoros\ServerRequestFactory as LaminasServerRequestFactory;
 use Nyholm\Psr7\Factory\Psr17Factory as NyholmResponseFactory;
 use Nyholm\Psr7\Factory\Psr17Factory as NyholmServerRequestFactory;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ServerRequestFactoryInterface;
@@ -28,9 +29,7 @@
  */
 final class RouteMatcherLessTest extends TestCase
 {
-    /**
-     * @dataProvider providePsr7Implementations
-     */
+    #[DataProvider('providePsr7Implementations')]
     public function testMissingRouteMatcherMiddleware(
         ResponseFactoryInterface $responseFactory,
         ServerRequestFactoryInterface $serverRequestFactory
@@ -54,9 +53,7 @@ public function testMissingRouteMatcherMiddleware(
         );
     }
 
-    /**
-     * @dataProvider providePsr7Implementations
-     */
+    #[DataProvider('providePsr7Implementations')]
     public function testMissingRouteMatcherMiddlewareWithoutExceptionMiddleware(
         ResponseFactoryInterface $responseFactory,
         ServerRequestFactoryInterface $serverRequestFactory