Merge branch '6.4' into 7.0

* 6.4: [Validator] Add Catalan and Spanish translation for `WordCount` constraint" [DependencyInjection] Do not try to load default method name on interface [PropertyInfo] Fix nullable value returned from extractFromMutator on CollectionType
symfony · Jul 26, 2024 · ee413c2 · ee413c2
2 parents 7177b61 + edaea9d
commit ee413c2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/Extractor/ReflectionExtractor.php b/Extractor/ReflectionExtractor.php
@@ -423,7 +423,7 @@ private function extractFromMutator(string $class, string $property): ?array
         $type = $this->extractFromReflectionType($reflectionType, $reflectionMethod->getDeclaringClass());
 
         if (1 === \count($type) && \in_array($prefix, $this->arrayMutatorPrefixes)) {
-            $type = [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), $type[0])];
+            $type = [new Type(Type::BUILTIN_TYPE_ARRAY, $this->isNullableProperty($class, $property), null, true, new Type(Type::BUILTIN_TYPE_INT), $type[0])];
         }
 
         return $type;

diff --git a/Tests/Extractor/ReflectionExtractorTest.php b/Tests/Extractor/ReflectionExtractorTest.php
@@ -521,6 +521,7 @@ public function testTypedProperties()
         $this->assertEquals([new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))], $this->extractor->getTypes(Php74Dummy::class, 'stringCollection'));
         $this->assertEquals([new Type(Type::BUILTIN_TYPE_INT, true)], $this->extractor->getTypes(Php74Dummy::class, 'nullableWithDefault'));
         $this->assertEquals([new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true)], $this->extractor->getTypes(Php74Dummy::class, 'collection'));
+        $this->assertEquals([new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class))], $this->extractor->getTypes(Php74Dummy::class, 'nullableTypedCollection'));
     }
 
     /**

diff --git a/Tests/Fixtures/Php74Dummy.php b/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
+    {
+    }
 }