Support PHP 8.4

.github/workflows/ci.yaml

@@ -39,6 +39,12 @@ jobs:
           - php-version: 8.3
             dependencies: "--prefer-lowest --prefer-stable"
             test_coverage: "no"
+          - php-version: 8.4
+            dependencies: "--prefer-stable"
+            test_coverage: "no"
+          - php-version: 8.4
+            dependencies: "--prefer-lowest --prefer-stable"
+            test_coverage: "no"
 
     steps:
       - name: Setup PHP

composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "^7.2 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-intl": "*",
         "laminas/laminas-eventmanager": "^3.1",
         "laminas/laminas-http": "^2.7",

src/SlmLocale/Locale/Detector.php

@@ -145,7 +145,7 @@ public function hasMappings()
         return is_array($this->mappings) && count($this->mappings);
     }
 
-    public function detect(RequestInterface $request, ResponseInterface $response = null)
+    public function detect(RequestInterface $request, ?ResponseInterface $response = null)
     {
         $event = new LocaleEvent(LocaleEvent::EVENT_DETECT, $this);
         $event->setRequest($request);

src/SlmLocale/Service/PrimaryLanguageHelperFactory.php

@@ -52,7 +52,7 @@ final class PrimaryLanguageHelperFactory implements FactoryInterface
      * @param array|null $options
      * @return object|PrimaryLanguage
      */
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
     {
         return new PrimaryLanguage(new Locale());
     }

src/SlmLocale/Strategy/UriPathStrategy.php

@@ -66,7 +66,7 @@ class UriPathStrategy extends AbstractStrategy
      */
     protected $router;
 
-    public function __construct(SimpleRouteStack $router = null)
+    public function __construct(?SimpleRouteStack $router = null)
     {
         $this->router = $router;
     }
@@ -267,7 +267,7 @@ protected function getAliasForLocale($locale)
      * @param RequestInterface|null $request
      * @return string|null
      */
-    protected function getBasePath(RequestInterface $request = null)
+    protected function getBasePath(?RequestInterface $request = null)
     {
         $result = null;
         if ($this->router instanceof TreeRouteStack) {

src/SlmLocale/View/Helper/LocaleUrl.php

@@ -59,7 +59,7 @@ class LocaleUrl extends AbstractHelper
      */
     protected $request;
 
-    public function __construct(Detector $detector, Request $request, RouteMatch $match = null)
+    public function __construct(Detector $detector, Request $request, ?RouteMatch $match = null)
     {
         $this->detector = $detector;
         $this->match    = $match;