Fix PHP 8.4 deprecations nullable objects (#27)

handcraftedinthealps · Dec 2, 2024 · a6d12f3 · a6d12f3
1 parent 5787e9b
commit a6d12f3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -42,6 +42,9 @@
         'get_class_to_class_keyword' => false,
         'phpdoc_separation' => false,
         'fully_qualified_strict_types' => false,
+        'nullable_type_declaration_for_default_null_value' => true,
+        'native_function_invocation' => false,
+        'trailing_comma_in_multiline' => false,
     ])
     ->setRiskyAllowed(true)
     ->setFinder(

diff --git a/Routing/Loader/Reader/RestActionReader.php b/Routing/Loader/Reader/RestActionReader.php
@@ -640,7 +640,7 @@ private function readMethodAnnotations(\ReflectionMethod $reflectionMethod, stri
         return $annotations;
     }
 
-    private function addRoute(RestRouteCollection $collection, string $routeName, Route $route, bool $isCollection, bool $isInflectable, RouteAnnotation $annotation = null): void
+    private function addRoute(RestRouteCollection $collection, string $routeName, Route $route, bool $isCollection, bool $isInflectable, ?RouteAnnotation $annotation = null): void
     {
         if ($annotation && null !== $annotation->getName()) {
             $options = $annotation->getOptions();

diff --git a/Routing/Loader/RestRouteProcessor.php b/Routing/Loader/RestRouteProcessor.php
@@ -30,10 +30,10 @@ public function importResource(
         LoaderInterface $loader,
         $resource,
         array $parents = [],
-        string $routePrefix = null,
-        string $namePrefix = null,
-        string $type = null,
-        string $currentDir = null
+        ?string $routePrefix = null,
+        ?string $namePrefix = null,
+        ?string $type = null,
+        ?string $currentDir = null
     ): RouteCollection {
         $loader = $loader->resolve($resource, $type);
 

diff --git a/Routing/Loader/RestXmlCollectionLoader.php b/Routing/Loader/RestXmlCollectionLoader.php
@@ -41,7 +41,7 @@ public function __construct(
         RestRouteProcessor $processor,
         bool $includeFormat = true,
         array $formats = [],
-        string $defaultFormat = null
+        ?string $defaultFormat = null
     ) {
         parent::__construct($locator);
 

diff --git a/Routing/Loader/RestYamlCollectionLoader.php b/Routing/Loader/RestYamlCollectionLoader.php
@@ -41,7 +41,7 @@ public function __construct(
         RestRouteProcessor $processor,
         bool $includeFormat = true,
         array $formats = [],
-        string $defaultFormat = null
+        ?string $defaultFormat = null
     ) {
         parent::__construct($locator);