minor #20153 [VarDumper] Fix ReflectionNamedType->getName() detection (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 31a68b8bef08 · 2016-10-04T14:38:45.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [VarDumper] Fix ReflectionNamedType->getName() detection | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - There is no side effect to this patch, except that __toString were still used, whereas getName should have been (both methods return the same, but __toString is deprecated since 7.1). I somehow missed that getName was on a new `ReflectionNamedType` class... Commits ------- dda18df [VarDumper] Fix ReflectionNamedType->getName() detection
diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
@@ -115,7 +115,8 @@ public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, arra
         ));
 
         if (isset($a[$prefix.'returnType'])) {
-            $a[$prefix.'returnType'] = method_exists('ReflectionType', 'getName') ? $a[$prefix.'returnType']->getName() : $a[$prefix.'returnType']->__toString();
+            $v = $a[$prefix.'returnType'];
+            $a[$prefix.'returnType'] = $v instanceof \ReflectionNamedType ? $v->getName() : $v->__toString();
         }
         if (isset($a[$prefix.'this'])) {
             $a[$prefix.'this'] = new CutStub($a[$prefix.'this']);
@@ -168,9 +169,9 @@ public static function castParameter(\ReflectionParameter $c, array $a, Stub $st
         ));
 
         try {
-            if (method_exists($c, 'hasType')) {
-                if ($c->hasType()) {
-                    $a[$prefix.'typeHint'] = method_exists('ReflectionType', 'getName') ? $c->getType()->getName() : $c->getType()->__toString();
+            if (method_exists($c, 'getType')) {
+                if ($v = $c->getType()) {
+                    $a[$prefix.'typeHint'] = $v instanceof \ReflectionNamedType ? $v->getName() : $v->__toString();
                 }
             } else {
                 $v = explode(' ', $c->__toString(), 6);
@@ -196,7 +197,7 @@ public static function castParameter(\ReflectionParameter $c, array $a, Stub $st
                 unset($a[$prefix.'allowsNull']);
             }
         } catch (\ReflectionException $e) {
-            if (isset($a[$prefix.'typeHint']) && $c->allowsNull() && !method_exists('ReflectionType', 'getName')) {
+            if (isset($a[$prefix.'typeHint']) && $c->allowsNull() && !class_exists('ReflectionNamedType', false)) {
                 $a[$prefix.'default'] = null;
                 unset($a[$prefix.'allowsNull']);
             }
