Fix no collection in extract default value

Korbeil · Korbeil · commit 33d37e56ba2d · 2020-10-06T22:24:13.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -477,8 +477,9 @@ private function extractFromDefaultValue(string $class, string $property): ?arra
         }
 
         $type = \gettype($defaultValue);
+        $type = static::MAP_TYPES[$type] ?? $type;
 
-        return [new Type(static::MAP_TYPES[$type] ?? $type)];
+        return [new Type($type, false, null, Type::BUILTIN_TYPE_ARRAY === $type)];
     }
 
     private function extractFromReflectionType(\ReflectionType $reflectionType, \ReflectionClass $declaringClass): array
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -257,7 +257,7 @@ public function defaultValueProvider()
             ['defaultInt', [new Type(Type::BUILTIN_TYPE_INT, false)]],
             ['defaultFloat', [new Type(Type::BUILTIN_TYPE_FLOAT, false)]],
             ['defaultString', [new Type(Type::BUILTIN_TYPE_STRING, false)]],
-            ['defaultArray', [new Type(Type::BUILTIN_TYPE_ARRAY, false)]],
+            ['defaultArray', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true)]],
             ['defaultNull', null],
         ];
     }
@@ -415,6 +415,7 @@ public function testTypedProperties(): void
         $this->assertEquals([new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)], $this->extractor->getTypes(Php74Dummy::class, 'dummy'));
         $this->assertEquals([new Type(Type::BUILTIN_TYPE_BOOL, true)], $this->extractor->getTypes(Php74Dummy::class, 'nullableBoolProp'));
         $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_ARRAY, false, null, true)], $this->extractor->getTypes(Php74Dummy::class, 'collection'));
     }
 
     /**
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php74Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php74Dummy.php
@@ -20,6 +20,7 @@ class Php74Dummy
     private ?bool $nullableBoolProp;
     /** @var string[] */
     private array $stringCollection;
+    public array $collection = [];
 
     public function addStringCollection(string $string): void
     {

Original file line number	Diff line number	Diff line change
`@@ -477,8 +477,9 @@ private function extractFromDefaultValue(string $class, string $property): ?arra`
`477`	`477`	`}`
`478`	`478`
`479`	`479`	`$type = \gettype($defaultValue);`
	`480`	`+ $type = static::MAP_TYPES[$type] ?? $type;`
`480`	`481`
`481`		`- return [new Type(static::MAP_TYPES[$type] ?? $type)];`
	`482`	`+ return [new Type($type, false, null, Type::BUILTIN_TYPE_ARRAY === $type)];`
`482`	`483`	`}`
`483`	`484`
`484`	`485`	`private function extractFromReflectionType(\ReflectionType $reflectionType, \ReflectionClass $declaringClass): array`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ class Php74Dummy`
`20`	`20`	`private ?bool $nullableBoolProp;`
`21`	`21`	`/** @var string[] */`
`22`	`22`	`private array $stringCollection;`
	`23`	`+ public array $collection = [];`
`23`	`24`
`24`	`25`	`public function addStringCollection(string $string): void`
`25`	`26`	`{`