resolve class constant types when patching return types

xabbuh · xabbuh · commit 7e35a935dffe · 2024-10-10T16:06:31.000+02:00
diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -849,6 +849,26 @@ private function setReturnType(string $types, string $class, string $method, str
         $docTypes = [];
 
         foreach ($typesMap as $n => $t) {
+            if (str_contains($n, '::')) {
+                [$definingClass, $constantName] = explode('::', $n, 2);
+                $definingClass = match ($definingClass) {
+                    'self', 'static', 'parent' => $class,
+                    default => $definingClass,
+                };
+
+                if (!\defined($definingClass.'::'.$definingClass)) {
+                    return;
+                }
+
+                $constant = new \ReflectionClassConstant($definingClass, $constantName);
+
+                if (method_exists(\ReflectionClassConstant::class, 'getType') && $constantType = $constant->getType()) {
+                    $n = $constantType->getName();
+                } else {
+                    $n = gettype($constant->getValue());
+                }
+            }
+
             if ('null' === $n) {
                 $nullable = true;
                 continue;
@@ -872,10 +892,11 @@ private function setReturnType(string $types, string $class, string $method, str
                 continue;
             }
 
-            if (!isset($phpTypes[''])) {
+            if (!isset($phpTypes['']) && !\in_array($n, $phpTypes, true)) {
                 $phpTypes[] = $n;
             }
         }
+
         $docTypes = array_merge([], ...$docTypes);
 
         if (!$phpTypes) {
