bug #42098 [PropertyInfo] Support for intersection types (derrabus)

nicolas-grekas · nicolas-grekas · commit 3bf2d147690c · 2021-09-07T09:30:14.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [PropertyInfo] Support for intersection types | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #41552 | License | MIT | Doc PR | N/A I was a bit unsure how to fix this one. PropertyInfo does not know about the concept of intersection types yet. With this PR, the component will behave exactly the same for an intersection type as for a union: You will get an array of all atomic types. Commits ------- 9070047 [PropertyInfo] Support for intersection types
diff --git a/psalm.xml b/psalm.xml
@@ -17,4 +17,13 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+
+    <issueHandlers>
+        <UndefinedClass>
+            <errorLevel type="suppress">
+                <!-- Class has been added in PHP 8.1 -->
+                <referencedClass name="ReflectionIntersectionType"/>
+            </errorLevel>
+        </UndefinedClass>
+    </issueHandlers>
 </psalm>
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -333,8 +333,8 @@ private function extractFromReflectionType(\ReflectionType $reflectionType, \Ref
         $types = [];
         $nullable = $reflectionType->allowsNull();
 
-        foreach ($reflectionType instanceof \ReflectionUnionType ? $reflectionType->getTypes() : [$reflectionType] as $type) {
-            $phpTypeOrClass = $reflectionType instanceof \ReflectionNamedType ? $reflectionType->getName() : (string) $type;
+        foreach (($reflectionType instanceof \ReflectionUnionType || $reflectionType instanceof \ReflectionIntersectionType) ? $reflectionType->getTypes() : [$reflectionType] as $type) {
+            $phpTypeOrClass = $type->getName();
             if ('null' === $phpTypeOrClass || 'mixed' === $phpTypeOrClass || 'never' === $phpTypeOrClass) {
                 continue;
             }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -256,11 +256,20 @@ public function php80TypesProvider()
     }
 
     /**
+     * @dataProvider php81TypesProvider
      * @requires PHP 8.1
      */
-    public function testExtractPhp81Type()
+    public function testExtractPhp81Type($property, array $type = null)
     {
-        $this->assertNull($this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php81Dummy', 'nothing', []));
+        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php81Dummy', $property, []));
+    }
+
+    public function php81TypesProvider()
+    {
+        return [
+            ['nothing', null],
+            ['collection', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Traversable'), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Countable')]],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php81Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php81Dummy.php
@@ -8,4 +8,8 @@ public function getNothing(): never
     {
         throw new \Exception('Oops');
     }
+
+    public function getCollection(): \Traversable&\Countable
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,8 @@ public function getNothing(): never`
`8`	`8`	`{`
`9`	`9`	`throw new \Exception('Oops');`
`10`	`10`	`}`
	`11`	`+`
	`12`	`+ public function getCollection(): \Traversable&\Countable`
	`13`	`+ {`
	`14`	`+ }`
`11`	`15`	`}`