Replace implicitly nullable parameters for PHP 8.4

barryvdh · Nov 27, 2024 · 13763ae · 13763ae
1 parent 788e72e
commit 13763ae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Console/ModelsCommand.php b/src/Console/ModelsCommand.php
@@ -1304,7 +1304,7 @@ protected function getCommentFromDocBlock(\ReflectionMethod $reflection)
      *
      * @return null|string
      */
-    protected function getReturnTypeFromDocBlock(\ReflectionMethod $reflection, \Reflector $reflectorForContext = null)
+    protected function getReturnTypeFromDocBlock(\ReflectionMethod $reflection, ?\Reflector $reflectorForContext = null)
     {
         $phpDocContext = (new ContextFactory())->createFromReflector($reflectorForContext ?? $reflection);
         $context = new Context(

diff --git a/src/Generator.php b/src/Generator.php
@@ -50,7 +50,7 @@ public function __construct(
         $config,
         /* Illuminate\View\Factory */
         $view,
-        OutputInterface $output = null,
+        ?OutputInterface $output = null,
         $helpers = ''
     ) {
         $this->config = $config;

diff --git a/tests/MacroTest.php b/tests/MacroTest.php
@@ -55,7 +55,7 @@ public function testInitPhpDocClosureWithoutDocBlock(): void
     {
         $phpdoc = (new MacroMock())->getPhpDoc(
             new ReflectionFunction(
-                function (int $a = null): int {
+                function (?int $a = null): int {
                     return 0;
                 }
             )
@@ -79,7 +79,7 @@ public function testInitPhpDocClosureWithArgsAndReturnType(): void
                 /**
                  * Test docblock.
                  */
-                function (int $a = null): int {
+                function (?int $a = null): int {
                     return 0;
                 }
             )
@@ -103,7 +103,7 @@ public function testInitPhpDocClosureWithArgs(): void
                 /**
                  * Test docblock.
                  */
-                function (int $a = null) {
+                function (?int $a = null) {
                     return 0;
                 }
             )
@@ -274,7 +274,7 @@ public function __construct()
         // no need to call parent
     }
 
-    public function getPhpDoc(ReflectionFunctionAbstract $method, ReflectionClass $class = null): DocBlock
+    public function getPhpDoc(ReflectionFunctionAbstract $method, ?ReflectionClass $class = null): DocBlock
     {
         return (new Macro($method, '', $class ?? $method->getClosureScopeClass()))->phpdoc;
     }