Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 6b8ba82d95ae · 2020-06-18T21:38:14.000+02:00
* 3.4:
  Fix
diff --git a/ControllerMetadata/ArgumentMetadataFactory.php b/ControllerMetadata/ArgumentMetadataFactory.php
@@ -45,10 +45,10 @@ public function createArgumentMetadata($controller): array
      */
     private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function): ?string
     {
-        if (!($type = $parameter->getType()) instanceof \ReflectionNamedType) {
+        if (!$type = $parameter->getType()) {
             return null;
         }
-        $name = $type->getName();
+        $name = $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
 
         if ($function instanceof \ReflectionMethod) {
             $lcName = strtolower($name);

Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,10 @@ public function createArgumentMetadata($controller): array`
`45`	`45`	`*/`
`46`	`46`	`private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function): ?string`
`47`	`47`	`{`
`48`		`- if (!($type = $parameter->getType()) instanceof \ReflectionNamedType) {`
	`48`	`+ if (!$type = $parameter->getType()) {`
`49`	`49`	`return null;`
`50`	`50`	`}`
`51`		`- $name = $type->getName();`
	`51`	`+ $name = $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type;`
`52`	`52`
`53`	`53`	`if ($function instanceof \ReflectionMethod) {`
`54`	`54`	`$lcName = strtolower($name);`