bug #40160 [PropertyInfo] fix extracting mixed type-hinted property types (xabbuh)

fabpot · fabpot · commit 4a32fd04466b · 2021-02-14T11:36:42.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [PropertyInfo] fix extracting mixed type-hinted property types | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #39947 | License | MIT | Doc PR | Commits ------- be6432e fix extracting mixed type-hinted property types
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -162,8 +162,8 @@ public function getTypes($class, $property, array $context = []): ?array
             try {
                 $reflectionProperty = new \ReflectionProperty($class, $property);
                 $type = $reflectionProperty->getType();
-                if (null !== $type) {
-                    return $this->extractFromReflectionType($type, $reflectionProperty->getDeclaringClass());
+                if (null !== $type && $types = $this->extractFromReflectionType($type, $reflectionProperty->getDeclaringClass())) {
+                    return $types;
                 }
             } catch (\ReflectionException $e) {
                 // noop
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -239,6 +239,7 @@ public function php80TypesProvider()
             ['string', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Stringable'), new Type(Type::BUILTIN_TYPE_STRING)]],
             ['payload', null],
             ['data', null],
+            ['mixedProperty', null],
         ];
     }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php
@@ -4,6 +4,8 @@
 
 class Php80Dummy
 {
+    public mixed $mixedProperty;
+
     public function getFoo(): array|null
     {
     }

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,7 @@ public function php80TypesProvider()`
`239`	`239`	`['string', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Stringable'), new Type(Type::BUILTIN_TYPE_STRING)]],`
`240`	`240`	`['payload', null],`
`241`	`241`	`['data', null],`
	`242`	`+ ['mixedProperty', null],`
`242`	`243`	`];`
`243`	`244`	`}`
`244`	`245`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`class Php80Dummy`
`6`	`6`	`{`
	`7`	`+ public mixed $mixedProperty;`
	`8`	`+`
`7`	`9`	`public function getFoo(): array\|null`
`8`	`10`	`{`
`9`	`11`	`}`