[VarExporter] fix proxy helper when a method returns null

nikophil · nikophil · commit 59b3b7ad80c1 · 2024-05-07T09:12:57.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() && 'null' !== $type->getName() && 'mixed' !== $name ? '?' : '').$types[0];
         }
         sort($types);
 
@@ -357,11 +357,11 @@ private static function exportDefault(\ReflectionParameter $param): string
                 'parent' => ($parent = $class->getParentClass()) ? '\\'.$parent->name : 'parent',
                 default => '\\'.$m[2],
             }
-            : fn ($m) => $m[1].match ($m[2]) {
-                'new', 'false', 'true', 'null', 'self', 'parent' => $m[2],
-                'NULL' => 'null',
-                default => '\\'.$m[2],
-            };
+        : fn ($m) => $m[1].match ($m[2]) {
+            'new', 'false', 'true', 'null', 'self', 'parent' => $m[2],
+            'NULL' => 'null',
+            default => '\\'.$m[2],
+        };
 
         return implode('', array_map(fn ($part) => match ($part[0]) {
             '"' => $part, // for internal classes only
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyProxy/TestNullStandaloneReturnType.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyProxy/TestNullStandaloneReturnType.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy;
+
+/**
+ * @author Nicolas PHILIPPE <nikophil@gmail.com>
+ */
+class TestNullStandaloneReturnType
+{
+    public function foo(): null
+    {
+        return null;
+    }
+}
diff --git a/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php b/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
@@ -15,6 +15,7 @@
 use Symfony\Component\VarExporter\Exception\LogicException;
 use Symfony\Component\VarExporter\ProxyHelper;
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\StringMagicGetClass;
+use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\TestNullStandaloneReturnType;
 
 class ProxyHelperTest extends TestCase
 {
@@ -188,6 +189,17 @@ public function testCannotGenerateGhostForStringMagicGet()
         $this->expectException(LogicException::class);
         ProxyHelper::generateLazyGhost(new \ReflectionClass(StringMagicGetClass::class));
     }
+
+    /**
+     * @requires PHP 8.2
+     */
+    public function testNullStandaloneReturnType()
+    {
+        self::assertStringContainsString(
+            'public function foo(): null',
+            ProxyHelper::generateLazyProxy(new \ReflectionClass(TestNullStandaloneReturnType::class))
+        );
+    }
 }
 
 abstract class TestForProxyHelper
