PHP 8.4 support (#106)

Author: vjik

.github/workflows/bc.yml

@@ -30,4 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1']
+        ['8.4']

.github/workflows/build.yml

@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3', '8.4']

.github/workflows/composer-require-checker.yml

@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3', '8.4']

.github/workflows/rector.yml

@@ -1,5 +1,5 @@
 on:
-  pull_request:
+  pull_request_target:
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -17,7 +17,8 @@ jobs:
     secrets:
       token: ${{ secrets.YIISOFT_GITHUB_TOKEN }}
     with:
+      repository: ${{ github.event.pull_request.head.repo.full_name }}
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.3']
+        ['8.4']

.github/workflows/static.yml

@@ -29,4 +29,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3', '8.4']

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - New #101: Add `MiddlewareCollector` for Yii Debug package (@xepozz)
 - Enh #95: Raise minimum PHP version to `^8.1` and make all possible properties readonly (@xepozz)
+- Chg #106: Change PHP constraint in `composer.json` to `8.1 - 8.4` (@vjik)
+- Enh #106: Mark `MiddlewareStack::$fallbackHandler` readonly (@vjik)
 
 ## 5.2.0 September 25, 2023
 

composer.json

@@ -27,25 +27,25 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "psr/container": "^1.0|^2.0",
+        "php": "8.1 - 8.4",
+        "psr/container": "^1.0 || ^2.0",
         "psr/event-dispatcher": "^1.0",
-        "psr/http-message": "^1.0|^2.0",
+        "psr/http-message": "^1.0 || ^2.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
-        "yiisoft/definitions": "^2.0|^3.0",
+        "yiisoft/definitions": "^2.0 || ^3.0",
         "yiisoft/friendly-exception": "^1.1",
         "yiisoft/injector": "^1.0"
     },
     "require-dev": {
-        "maglnet/composer-require-checker": "^4.2",
-        "nyholm/psr7": "^1.4",
-        "phpunit/phpunit": "^9.5",
-        "rector/rector": "^1.0.0",
-        "roave/infection-static-analysis-plugin": "^1.18",
-        "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^5.3",
-        "yiisoft/test-support": "^3.0",
+        "maglnet/composer-require-checker": "^4.7.1",
+        "nyholm/psr7": "^1.8.2",
+        "phpunit/phpunit": "^9.6.22",
+        "rector/rector": "^1.2.10",
+        "roave/infection-static-analysis-plugin": "^1.35",
+        "spatie/phpunit-watcher": "^1.24",
+        "vimeo/psalm": "^5.26.1 || ^6.9.4",
+        "yiisoft/test-support": "^3.0.2",
         "yiisoft/yii-debug": "dev-master"
     },
     "autoload": {

psalm.xml

@@ -3,6 +3,7 @@
     errorLevel="1"
     findUnusedBaselineEntry="true"
     findUnusedCode="false"
+    ensureOverrideAttribute="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

rector.php

@@ -6,26 +6,19 @@
 use Rector\Config\RectorConfig;
 use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
 use Rector\Php81\Rector\Array_\FirstClassCallableRector;
-use Rector\Set\ValueObject\LevelSetList;
 
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->paths([
+return RectorConfig::configure()
+    ->withPaths([
         __DIR__ . '/src',
         __DIR__ . '/tests',
-    ]);
-
-    // register a single rule
-    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
-
-    // define sets of rules
-    $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_81,
-    ]);
-
-    $rectorConfig->skip([
+    ])
+    ->withPhpSets(php81: true)
+    ->withRules([
+        InlineConstructorDefaultToPropertyRector::class,
+    ])
+    ->withSkip([
         ClassPropertyAssignToConstructorPromotionRector::class,
         FirstClassCallableRector::class => [
             __DIR__ . '/tests/*',
         ],
     ]);
-};

src/MiddlewareStack.php

@@ -32,7 +32,7 @@ final class MiddlewareStack implements RequestHandlerInterface
      */
     public function __construct(
         private readonly array $middlewares,
-        private RequestHandlerInterface $fallbackHandler,
+        private readonly RequestHandlerInterface $fallbackHandler,
         private readonly ?EventDispatcherInterface $eventDispatcher = null
     ) {
         if ($middlewares === []) {

tests/MiddlewareDispatcherTest.php

@@ -236,7 +236,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
     }
 
     private function createDispatcher(
-        ContainerInterface $container = null,
+        ?ContainerInterface $container = null,
         ?EventDispatcherInterface $eventDispatcher = null
     ): MiddlewareDispatcher {
         if ($container === null) {

tests/MiddlewareFactoryTest.php

@@ -324,8 +324,8 @@ public function testInvalidMiddlewareWithWrongArrayWithIntItems(): void
     }
 
     private function getMiddlewareFactory(
-        ContainerInterface $container = null,
-        ParametersResolverInterface $parametersResolver = null
+        ?ContainerInterface $container = null,
+        ?ParametersResolverInterface $parametersResolver = null
     ): MiddlewareFactory {
         if ($container !== null) {
             return new MiddlewareFactory($container, $parametersResolver);