[VarDumper] Fix PHP 7.1 compat

nicolas-grekas · nicolas-grekas · commit fe567bfbe510 · 2016-09-29T13:12:48.000+01:00
diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
@@ -115,7 +115,7 @@ public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, arra
         ));
 
         if (isset($a[$prefix.'returnType'])) {
-            $a[$prefix.'returnType'] = (string) $a[$prefix.'returnType'];
+            $a[$prefix.'returnType'] = method_exists('ReflectionType', 'getName') ? $a[$prefix.'returnType']->getName() : $a[$prefix.'returnType']->__toString();
         }
         if (isset($a[$prefix.'this'])) {
             $a[$prefix.'this'] = new CutStub($a[$prefix.'this']);
@@ -164,12 +164,13 @@ public static function castParameter(\ReflectionParameter $c, array $a, Stub $st
             'position' => 'getPosition',
             'isVariadic' => 'isVariadic',
             'byReference' => 'isPassedByReference',
+            'allowsNull' => 'allowsNull',
         ));
 
         try {
             if (method_exists($c, 'hasType')) {
                 if ($c->hasType()) {
-                    $a[$prefix.'typeHint'] = $c->getType()->__toString();
+                    $a[$prefix.'typeHint'] = method_exists('ReflectionType', 'getName') ? $c->getType()->getName() : $c->getType()->__toString();
                 }
             } else {
                 $v = explode(' ', $c->__toString(), 6);
@@ -182,14 +183,20 @@ public static function castParameter(\ReflectionParameter $c, array $a, Stub $st
                 $a[$prefix.'typeHint'] = $m[1];
             }
         }
+        if (!isset($a[$prefix.'typeHint'])) {
+            unset($a[$prefix.'allowsNull']);
+        }
 
         try {
             $a[$prefix.'default'] = $v = $c->getDefaultValue();
             if (method_exists($c, 'isDefaultValueConstant') && $c->isDefaultValueConstant()) {
                 $a[$prefix.'default'] = new ConstStub($c->getDefaultValueConstantName(), $v);
             }
+            if (null === $v) {
+                unset($a[$prefix.'allowsNull']);
+            }
         } catch (\ReflectionException $e) {
-            if (isset($a[$prefix.'typeHint']) && $c->allowsNull()) {
+            if (isset($a[$prefix.'typeHint']) && $c->allowsNull() && !method_exists('ReflectionType', 'getName')) {
                 $a[$prefix.'default'] = null;
             }
         }
