Allow to work with global constant without FQCN

kylekatarnls · kylekatarnls · commit 4420c35a4b69 · 2024-05-20T13:28:39.000+02:00
diff --git a/src/Symfony/Component/VarExporter/ProxyHelper.php b/src/Symfony/Component/VarExporter/ProxyHelper.php
@@ -349,24 +349,44 @@ private static function exportDefault(\ReflectionParameter $param): string
 
         $regexp = '/([\[\( ]|^)([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z0-9_\x7f-\xff]++)*+)(?!: )/';
         $callback = (false !== strpbrk($default, "\\:('") && $class = $param->getDeclaringClass())
-            ? fn ($m) => $m[1].match ($m[2]) {
+            ? (fn ($m) => $m[1].match ($m[2]) {
                 'new', 'false', 'true', 'null' => $m[2],
-                'NULL' => 'null',
                 'self' => '\\'.$class->name,
                 'namespace\\parent',
                 'parent' => ($parent = $class->getParentClass()) ? '\\'.$parent->name : 'parent',
-                default => '\\'.$m[2],
-            }
-            : fn ($m) => $m[1].match ($m[2]) {
+                default => self::exportDefaultValue($param, $m[2]),
+            })
+            : (fn ($m) => $m[1].match ($m[2]) {
                 'new', 'false', 'true', 'null', 'self', 'parent' => $m[2],
-                'NULL' => 'null',
-                default => '\\'.$m[2],
-            };
+                default => self::exportDefaultValue($param, $m[2]),
+            });
 
         return implode('', array_map(fn ($part) => match ($part[0]) {
             '"' => $part, // for internal classes only
             "'" => false !== strpbrk($part, "\\\0\r\n") ? '"'.substr(str_replace(['$', "\0", "\r", "\n"], ['\$', '\0', '\r', '\n'], $part), 1, -1).'"' : $part,
             default => preg_replace_callback($regexp, $callback, $part),
         }, $parts));
     }
+
+    private static function exportDefaultValue(\ReflectionParameter $param, string $value): string
+    {
+        if ('NULL' === $value) {
+            return 'null';
+        }
+
+        if (
+            $param->isDefaultValueConstant()
+            && $value === $param->getDefaultValueConstantName()
+            && str_contains($value, '\\')
+            && !\defined($value)
+        ) {
+            $globalConstant = '\\'.preg_replace('/^.*\\\\([^\\\\]+)$/', '$1', $value);
+
+            if (\defined($globalConstant) && $param->getDefaultValue() === \constant($globalConstant)) {
+                return $globalConstant;
+            }
+        }
+
+        return '\\'.$value;
+    }
 }
diff --git a/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php b/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
@@ -20,6 +20,7 @@
 class ProxyHelperTest extends TestCase
 {
     /**
+     * @group i
      * @dataProvider provideExportSignature
      */
     public function testExportSignature(string $expected, \ReflectionMethod $method)
@@ -37,6 +38,7 @@ public static function provideExportSignature()
             $expected = str_replace(['.', ' .  .  . ', '\'$a\', \'$a\n\', "\$a\n"'], [' . ', '...', '\'$a\', "\$a\\\n", "\$a\n"'], $expected);
             $expected = str_replace('Bar', '\\'.Bar::class, $expected);
             $expected = str_replace('self', '\\'.TestForProxyHelper::class, $expected);
+            $expected = str_replace('= M_PI', '= \\M_PI', $expected);
 
             yield [$expected, $method];
         }
@@ -237,6 +239,10 @@ public static function foo8()
     public function foo9($a = self::BOB, $b = ['$a', '$a\n', "\$a\n"], $c = ['$a', '$a\n', "\$a\n", new \stdClass()])
     {
     }
+
+    public function foo10($a = M_PI)
+    {
+    }
 }
 
 interface TestForProxyHelperInterface1

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`class ProxyHelperTest extends TestCase`
`21`	`21`	`{`
`22`	`22`	`/**`
	`23`	`+ * @group i`
`23`	`24`	`* @dataProvider provideExportSignature`
`24`	`25`	`*/`
`25`	`26`	`public function testExportSignature(string $expected, \ReflectionMethod $method)`
`@@ -37,6 +38,7 @@ public static function provideExportSignature()`
`37`	`38`	`$expected = str_replace(['.', ' . . . ', '\'$a\', \'$a\n\', "\$a\n"'], [' . ', '...', '\'$a\', "\$a\\\n", "\$a\n"'], $expected);`
`38`	`39`	`$expected = str_replace('Bar', '\\'.Bar::class, $expected);`
`39`	`40`	`$expected = str_replace('self', '\\'.TestForProxyHelper::class, $expected);`
	`41`	`+ $expected = str_replace('= M_PI', '= \\M_PI', $expected);`
`40`	`42`
`41`	`43`	`yield [$expected, $method];`
`42`	`44`	`}`
`@@ -237,6 +239,10 @@ public static function foo8()`
`237`	`239`	`public function foo9($a = self::BOB, $b = ['$a', '$a\n', "\$a\n"], $c = ['$a', '$a\n', "\$a\n", new \stdClass()])`
`238`	`240`	`{`
`239`	`241`	`}`
	`242`	`+`
	`243`	`+ public function foo10($a = M_PI)`
	`244`	`+ {`
	`245`	`+ }`
`240`	`246`	`}`
`241`	`247`
`242`	`248`	`interface TestForProxyHelperInterface1`