Merge pull request LM-Commons#72 from visto9259/php_8_4

php_8_4
visto9259 · Nov 23, 2024 · 039f0e7 · 039f0e7
2 parents 1c1cac1 + 9338cfc
commit 039f0e7
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 52 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -13,11 +13,11 @@ jobs:
   build:
     strategy:
       matrix:
-        php_version: ['8.1', '8.2', '8.3']
+        php_version: ['8.1', '8.2', '8.3', '8.4']
         deps: ['--prefer-lowest', '--prefer-dist']
         include:
           - code-coverage: 'yes'
-            php_version: '8.2'
+            php_version: '8.3'
             deps: ''
 
     runs-on: ubuntu-latest

diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         }
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "laminas/laminas-eventmanager": "^2.6.4 || ^3.2.1",
         "laminas/laminas-http": "^2.10",
         "laminas/laminas-mvc": "^2.7.15 || ^3.1.1",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Service/CorsService.php b/src/Service/CorsService.php
@@ -131,7 +131,7 @@ public function createPreflightCorsResponse(HttpRequest $request): HttpResponse
      *
      * @return HttpResponse
      */
-    public function createPreflightCorsResponseWithRouteOptions(HttpRequest $request, RouteMatch $routeMatch = null): HttpResponse
+    public function createPreflightCorsResponseWithRouteOptions(HttpRequest $request, RouteMatch|null $routeMatch = null): HttpResponse
     {
         $options = $this->options;
         if ($routeMatch instanceof RouteMatch) {
@@ -149,7 +149,7 @@ public function createPreflightCorsResponseWithRouteOptions(HttpRequest $request
      * @return HttpResponse
      * @throws DisallowedOriginException If the origin is not allowed
      */
-    public function populateCorsResponse(HttpRequest $request, HttpResponse $response, RouteMatch $routeMatch = null): HttpResponse
+    public function populateCorsResponse(HttpRequest $request, HttpResponse $response, RouteMatch|null $routeMatch = null): HttpResponse
     {
         if ($routeMatch instanceof RouteMatch) {
             $this->options->setFromArray($routeMatch->getParam(CorsOptions::ROUTE_PARAM) ?: []);

diff --git a/tests/Util/ServiceManagerFactory.php b/tests/Util/ServiceManagerFactory.php
@@ -65,7 +65,7 @@ public static function getApplicationConfig(): array
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
-    public static function getServiceManager(array $config = null): ServiceManager
+    public static function getServiceManager(array|null $config = null): ServiceManager
     {
         $config = $config ?: static::getApplicationConfig();
         $serviceManager = new ServiceManager();