[VarExporter] fix proxy helper when a method returns null

nikophil · nikophil · commit 6fd179494222 · 2024-05-06T16:50:14.000+02:00
diff --git a/src/Symfony/Component/VarExporter/ProxyHelper.php b/src/Symfony/Component/VarExporter/ProxyHelper.php
@@ -311,7 +311,7 @@ public static function exportType(\ReflectionFunctionAbstract|\ReflectionPropert
             return '';
         }
         if (null === $glue) {
-            return (!$noBuiltin && $type->allowsNull() && 'mixed' !== $name ? '?' : '').$types[0];
+            return (!$noBuiltin && $type->allowsNull() && $type->getName() !== 'null' && 'mixed' !== $name ? '?' : '').$types[0];
         }
         sort($types);
 
diff --git a/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php b/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
@@ -188,6 +188,24 @@ public function testCannotGenerateGhostForStringMagicGet()
         $this->expectException(LogicException::class);
         ProxyHelper::generateLazyGhost(new \ReflectionClass(StringMagicGetClass::class));
     }
+
+    /**
+     * @requires PHP 8.2
+     */
+    public function testNullStandaloneReturnType()
+    {
+        $classWithNullReturnType = new class{
+            public function foo(): null
+            {
+                return null;
+            }
+        };
+
+        self::assertStringContainsString(
+            'public function foo(): null',
+            ProxyHelper::generateLazyProxy(new \ReflectionClass($classWithNullReturnType))
+        );
+    }
 }
 
 abstract class TestForProxyHelper

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ public static function exportType(\ReflectionFunctionAbstract\|\ReflectionPropert`
`311`	`311`	`return '';`
`312`	`312`	`}`
`313`	`313`	`if (null === $glue) {`
`314`		`- return (!$noBuiltin && $type->allowsNull() && 'mixed' !== $name ? '?' : '').$types[0];`
	`314`	`+ return (!$noBuiltin && $type->allowsNull() && $type->getName() !== 'null' && 'mixed' !== $name ? '?' : '').$types[0];`
`315`	`315`	`}`
`316`	`316`	`sort($types);`
`317`	`317`