Merge branch '6.1' into 6.2

* 6.1:
  Fix tests that use deprecated callable syntax
  Make sure nested composite types do not crash ReflectionExtractor

Author: derrabus

src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php

@@ -206,11 +206,25 @@ public function testDescribeCallable($callable, $expectedDescription)
         $this->assertDescription($expectedDescription, $callable);
     }
 
-    public function getDescribeCallableTestData()
+    public function getDescribeCallableTestData(): array
     {
         return $this->getDescriptionTestData(ObjectsProvider::getCallables());
     }
 
+    /**
+     * @group legacy
+     * @dataProvider getDescribeDeprecatedCallableTestData
+     */
+    public function testDescribeDeprecatedCallable($callable, $expectedDescription)
+    {
+        $this->assertDescription($expectedDescription, $callable);
+    }
+
+    public function getDescribeDeprecatedCallableTestData(): array
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getDeprecatedCallables());
+    }
+
     /** @dataProvider getClassDescriptionTestData */
     public function testGetClassDescription($object, $expectedDescription)
     {

src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php

@@ -245,19 +245,25 @@ public static function getEventDispatchers()
         return ['event_dispatcher_1' => $eventDispatcher];
     }
 
-    public static function getCallables()
+    public static function getCallables(): array
     {
         return [
             'callable_1' => 'array_key_exists',
             'callable_2' => ['Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass', 'staticMethod'],
             'callable_3' => [new CallableClass(), 'method'],
             'callable_4' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass::staticMethod',
-            'callable_5' => ['Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\ExtendedCallableClass', 'parent::staticMethod'],
             'callable_6' => function () { return 'Closure'; },
             'callable_7' => new CallableClass(),
             'callable_from_callable' => (new CallableClass())(...),
         ];
     }
+
+    public static function getDeprecatedCallables(): array
+    {
+        return [
+            'callable_5' => ['Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\ExtendedCallableClass', 'parent::staticMethod'],
+        ];
+    }
 }
 
 class CallableClass

src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php

@@ -537,6 +537,11 @@ private function extractFromReflectionType(\ReflectionType $reflectionType, \Ref
         $nullable = $reflectionType->allowsNull();
 
         foreach (($reflectionType instanceof \ReflectionUnionType || $reflectionType instanceof \ReflectionIntersectionType) ? $reflectionType->getTypes() : [$reflectionType] as $type) {
+            if (!$type instanceof \ReflectionNamedType) {
+                // Nested composite types are not supported yet.
+                return [];
+            }
+
             $phpTypeOrClass = $type->getName();
             if ('null' === $phpTypeOrClass || 'mixed' === $phpTypeOrClass || 'never' === $phpTypeOrClass) {
                 continue;

src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php

@@ -309,11 +309,15 @@ public function testExtractPhp82Type($property, array $type = null)
         $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php82Dummy', $property, []));
     }
 
-    public function php82TypesProvider()
+    public function php82TypesProvider(): iterable
     {
         yield ['nil', null];
         yield ['false', [new Type(Type::BUILTIN_TYPE_FALSE)]];
         yield ['true', [new Type(Type::BUILTIN_TYPE_TRUE)]];
+
+        // Nesting intersection and union types is not supported yet,
+        // but we should make sure this kind of composite types does not crash the extractor.
+        yield ['someCollection', null];
     }
 
     /**

src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php82Dummy.php

@@ -18,4 +18,6 @@ class Php82Dummy
     public false $false = false;
 
     public true $true = true;
+
+    public (\Traversable&\Countable)|null $someCollection = null;
 }