Merge branch '7.1' into 7.2

* 7.1:
  [Security] Update web-token/jwt-library version and adjust checker parameters
  [Validator] Add Catalan and Spanish translation for `WordCount` constraint"
  [DependencyInjection] Do not try to load default method name on interface
  fix tests
  [PropertyInfo] Fix nullable value returned from extractFromMutator on CollectionType

Author: fabpot

src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php

@@ -133,6 +133,10 @@ public static function getDefault(ContainerBuilder $container, string $serviceId
             return null;
         }
 
+        if ($r->isInterface()) {
+            return null;
+        }
+
         if (null !== $indexAttribute) {
             $service = $class !== $serviceId ? \sprintf('service "%s"', $serviceId) : 'on the corresponding service';
             $message = [\sprintf('Either method "%s::%s()" should ', $class, $defaultMethod), \sprintf(' or tag "%s" on %s is missing attribute "%s".', $tagName, $service, $indexAttribute)];

src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php

@@ -151,13 +151,16 @@ public function testTheIndexedTagsByDefaultIndexMethod()
 
         $container->register('service3', IntTagClass::class)->addTag('my_custom_tag');
 
+        $container->register('service4', HelloInterface::class)->addTag('my_custom_tag');
+
         $priorityTaggedServiceTraitImplementation = new PriorityTaggedServiceTraitImplementation();
 
         $tag = new TaggedIteratorArgument('my_custom_tag', 'foo', 'getFooBar');
         $expected = [
             'bar_tab_class_with_defaultmethod' => new TypedReference('service2', BarTagClass::class),
             'service1' => new TypedReference('service1', FooTagClass::class),
             '10' => new TypedReference('service3', IntTagClass::class),
+            'service4' => new TypedReference('service4', HelloInterface::class),
         ];
         $services = $priorityTaggedServiceTraitImplementation->test($tag, $container);
         $this->assertSame(array_keys($expected), array_keys($services));
@@ -247,3 +250,8 @@ class HelloNamedService extends \stdClass
 class HelloNamedService2
 {
 }
+
+interface HelloInterface
+{
+    public static function getFooBar(): string;
+}

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

@@ -538,7 +538,7 @@ private function extractFromMutator(string $class, string $property): ?array
         $type = $this->extractFromReflectionType($reflectionType, $reflectionMethod->getDeclaringClass());
 
         if (1 === \count($type) && \in_array($prefix, $this->arrayMutatorPrefixes, true)) {
-            $type = [new LegacyType(LegacyType::BUILTIN_TYPE_ARRAY, false, null, true, new LegacyType(LegacyType::BUILTIN_TYPE_INT), $type[0])];
+            $type = [new LegacyType(LegacyType::BUILTIN_TYPE_ARRAY, $this->isNullableProperty($class, $property), null, true, new LegacyType(LegacyType::BUILTIN_TYPE_INT), $type[0])];
         }
 
         return $type;

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

@@ -33,6 +33,7 @@
 use Symfony\Component\PropertyInfo\Tests\Fixtures\SnakeCaseDummy;
 use Symfony\Component\PropertyInfo\Type as LegacyType;
 use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeResolver\PhpDocAwareReflectionTypeResolver;
 
 /**
  * @author Kévin Dunglas <[email protected]>
@@ -548,6 +549,7 @@ public function testTypedPropertiesLegacy()
         $this->assertEquals([new LegacyType(LegacyType::BUILTIN_TYPE_ARRAY, false, null, true, new LegacyType(LegacyType::BUILTIN_TYPE_INT), new LegacyType(LegacyType::BUILTIN_TYPE_STRING))], $this->extractor->getTypes(Php74Dummy::class, 'stringCollection'));
         $this->assertEquals([new LegacyType(LegacyType::BUILTIN_TYPE_INT, true)], $this->extractor->getTypes(Php74Dummy::class, 'nullableWithDefault'));
         $this->assertEquals([new LegacyType(LegacyType::BUILTIN_TYPE_ARRAY, false, null, true)], $this->extractor->getTypes(Php74Dummy::class, 'collection'));
+        $this->assertEquals([new LegacyType(LegacyType::BUILTIN_TYPE_ARRAY, true, null, true, new LegacyType(LegacyType::BUILTIN_TYPE_INT), new LegacyType(LegacyType::BUILTIN_TYPE_OBJECT, false, Dummy::class))], $this->extractor->getTypes(Php74Dummy::class, 'nullableTypedCollection'));
     }
 
     /**
@@ -696,9 +698,9 @@ public function testExtractors(string $property, ?Type $type)
      */
     public static function typesProvider(): iterable
     {
-        yield ['a', null];
+        yield ['a', class_exists(PhpDocAwareReflectionTypeResolver::class) ? Type::int() : null];
         yield ['b', Type::nullable(Type::object(ParentDummy::class))];
-        yield ['e', null];
+        yield ['e', class_exists(PhpDocAwareReflectionTypeResolver::class) ? Type::list(Type::resource()) : null];
         yield ['f', Type::list(Type::object(\DateTimeImmutable::class))];
         yield ['donotexist', null];
         yield ['staticGetter', null];
@@ -881,8 +883,8 @@ public function testExtractConstructorType(string $property, ?Type $type)
     public static function extractConstructorTypesProvider(): iterable
     {
         yield ['timezone', Type::object(\DateTimeZone::class)];
-        yield ['date', null];
-        yield ['dateObject', null];
+        yield ['date', class_exists(PhpDocAwareReflectionTypeResolver::class) ? Type::int() : null];
+        yield ['dateObject', class_exists(PhpDocAwareReflectionTypeResolver::class) ? Type::object(\DateTimeInterface::class) : null];
         yield ['dateTime', Type::object(\DateTimeImmutable::class)];
         yield ['ddd', null];
     }

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

@@ -23,11 +23,18 @@ class Php74Dummy
     private ?int $nullableWithDefault = 1;
     public array $collection = [];
 
+    /** @var Dummy[]|null  */
+    public ?array $nullableTypedCollection = null;
+
     public function addStringCollection(string $string): void
     {
     }
 
     public function removeStringCollection(string $string): void
     {
     }
+
+    public function addNullableTypedCollection(Dummy $dummy): void
+    {
+    }
 }