[PropertyInfo] Fix ReflectionExtractor::getTypesFromConstructor

ogizanagi · ogizanagi · commit 6423d8a82772 · 2020-08-28T18:07:48.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -194,11 +194,11 @@ public function getTypesFromConstructor(string $class, string $property): ?array
         if (!$reflectionType = $reflectionParameter->getType()) {
             return null;
         }
-        if (!$type = $this->extractFromReflectionType($reflectionType, $reflectionConstructor)) {
+        if (!$types = $this->extractFromReflectionType($reflectionType, $reflectionConstructor->getDeclaringClass())) {
             return null;
         }
 
-        return [$type];
+        return $types;
     }
 
     private function getReflectionParameterFromConstructor(string $property, \ReflectionMethod $reflectionConstructor): ?\ReflectionParameter

Original file line number	Diff line number	Diff line change
`@@ -194,11 +194,11 @@ public function getTypesFromConstructor(string $class, string $property): ?array`
`194`	`194`	`if (!$reflectionType = $reflectionParameter->getType()) {`
`195`	`195`	`return null;`
`196`	`196`	`}`
`197`		`- if (!$type = $this->extractFromReflectionType($reflectionType, $reflectionConstructor)) {`
	`197`	`+ if (!$types = $this->extractFromReflectionType($reflectionType, $reflectionConstructor->getDeclaringClass())) {`
`198`	`198`	`return null;`
`199`	`199`	`}`
`200`	`200`
`201`		`- return [$type];`
	`201`	`+ return $types;`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`private function getReflectionParameterFromConstructor(string $property, \ReflectionMethod $reflectionConstructor): ?\ReflectionParameter`