Run tests on PHP 8.4 (#240)

viktorprogger · web-flow · commit 0b7266954f33 · 2025-02-09T16:40:26.000+05:00
* Run tests on PHP 8.4

* Upgrade Psalm version

* Fix Psalm version

* Set infection version explicitly

* Set infection version explicitly

* Set infection version explicitly

* Fix implicitly nullable type

* Fix implicit nullable type

* Fix implicit nullable type
diff --git a/.github/workflows/bechmark.yml b/.github/workflows/bechmark.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']
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,4 +32,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3', '8.4']
diff --git a/.github/workflows/composer-require-checker.yml b/.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']
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -27,6 +27,6 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.3']
+        ['8.4']
     secrets:
       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -21,4 +21,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.3']
+        ['8.4']
diff --git a/.github/workflows/static.yml b/.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']
diff --git a/composer.json b/composer.json
@@ -51,8 +51,9 @@
         "phpunit/phpunit": "^10.5",
         "rector/rector": "^2.0",
         "roave/infection-static-analysis-plugin": "^1.34",
+        "infection/infection": "^0.27.8||^0.29.0",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^5.20",
+        "vimeo/psalm": "^5.20||^6.0",
         "yiisoft/test-support": "^3.0",
         "yiisoft/yii-debug": "dev-master"
     },
diff --git a/tests/Unit/Middleware/Consume/MiddlewareDispatcherTest.php b/tests/Unit/Middleware/Consume/MiddlewareDispatcherTest.php
@@ -159,7 +159,7 @@ public function handleConsume(ConsumeRequest $request): ConsumeRequest
     }
 
     private function createDispatcher(
-        ContainerInterface $container = null,
+        ?ContainerInterface $container = null,
     ): ConsumeMiddlewareDispatcher {
         $container ??= $this->createContainer([AdapterInterface::class => new FakeAdapter()]);
         $callableFactory = new CallableFactory($container);
diff --git a/tests/Unit/Middleware/Consume/MiddlewareFactoryTest.php b/tests/Unit/Middleware/Consume/MiddlewareFactoryTest.php
@@ -167,7 +167,7 @@ public function testInvalidMiddlewareWithWrongController(): void
         );
     }
 
-    private function getMiddlewareFactory(ContainerInterface $container = null): MiddlewareFactoryConsumeInterface
+    private function getMiddlewareFactory(?ContainerInterface $container = null): MiddlewareFactoryConsumeInterface
     {
         $container ??= $this->getContainer([AdapterInterface::class => new FakeAdapter()]);
 
diff --git a/tests/Unit/Middleware/FailureHandling/MiddlewareDispatcherTest.php b/tests/Unit/Middleware/FailureHandling/MiddlewareDispatcherTest.php
@@ -157,7 +157,7 @@ public function handleFailure(FailureHandlingRequest $request): FailureHandlingR
     }
 
     private function createDispatcher(
-        ContainerInterface $container = null,
+        ?ContainerInterface $container = null,
     ): FailureMiddlewareDispatcher {
         $container ??= $this->createContainer([AdapterInterface::class => new FakeAdapter()]);
         $callableFactory = new CallableFactory($container);
diff --git a/tests/Unit/Middleware/FailureHandling/MiddlewareFactoryTest.php b/tests/Unit/Middleware/FailureHandling/MiddlewareFactoryTest.php
@@ -151,7 +151,7 @@ public function testInvalidMiddlewareWithWrongController(): void
         );
     }
 
-    private function getMiddlewareFactory(ContainerInterface $container = null): MiddlewareFactoryFailureInterface
+    private function getMiddlewareFactory(?ContainerInterface $container = null): MiddlewareFactoryFailureInterface
     {
         $container ??= $this->getContainer([AdapterInterface::class => new FakeAdapter()]);
 
diff --git a/tests/Unit/Middleware/Push/MiddlewareDispatcherTest.php b/tests/Unit/Middleware/Push/MiddlewareDispatcherTest.php
@@ -167,7 +167,7 @@ public function handlePush(PushRequest $request): PushRequest
     }
 
     private function createDispatcher(
-        ContainerInterface $container = null,
+        ?ContainerInterface $container = null,
     ): PushMiddlewareDispatcher {
         $container ??= $this->createContainer([AdapterInterface::class => new FakeAdapter()]);
         $callableFactory = new CallableFactory($container);
diff --git a/tests/Unit/Middleware/Push/MiddlewareFactoryTest.php b/tests/Unit/Middleware/Push/MiddlewareFactoryTest.php
@@ -142,7 +142,7 @@ public function testInvalidMiddlewareWithWrongController(): void
         );
     }
 
-    private function getMiddlewareFactory(ContainerInterface $container = null): MiddlewareFactoryPushInterface
+    private function getMiddlewareFactory(?ContainerInterface $container = null): MiddlewareFactoryPushInterface
     {
         $container ??= $this->getContainer([AdapterInterface::class => new FakeAdapter()]);
 

-Original file line number
+Diff line change
       os: >-
         ['ubuntu-latest']
       php: >-
 -        ['8.3']
 +        ['8.4']
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public function handleConsume(ConsumeRequest $request): ConsumeRequest`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`private function createDispatcher(`
`162`		`- ContainerInterface $container = null,`
	`162`	`+ ?ContainerInterface $container = null,`
`163`	`163`	`): ConsumeMiddlewareDispatcher {`
`164`	`164`	`$container ??= $this->createContainer([AdapterInterface::class => new FakeAdapter()]);`
`165`	`165`	`$callableFactory = new CallableFactory($container);`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public function testInvalidMiddlewareWithWrongController(): void`
`167`	`167`	`);`
`168`	`168`	`}`
`169`	`169`
`170`		`- private function getMiddlewareFactory(ContainerInterface $container = null): MiddlewareFactoryConsumeInterface`
	`170`	`+ private function getMiddlewareFactory(?ContainerInterface $container = null): MiddlewareFactoryConsumeInterface`
`171`	`171`	`{`
`172`	`172`	`$container ??= $this->getContainer([AdapterInterface::class => new FakeAdapter()]);`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public function handleFailure(FailureHandlingRequest $request): FailureHandlingR`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`private function createDispatcher(`
`160`		`- ContainerInterface $container = null,`
	`160`	`+ ?ContainerInterface $container = null,`
`161`	`161`	`): FailureMiddlewareDispatcher {`
`162`	`162`	`$container ??= $this->createContainer([AdapterInterface::class => new FakeAdapter()]);`
`163`	`163`	`$callableFactory = new CallableFactory($container);`