diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #38446 [PropertyInfo] Extract from default value doesn't set collection boolean (Korbeil)

Browse Source 
This PR was merged into the 5.1 branch.

Discussion
----------

[PropertyInfo] Extract from default value doesn't set collection boolean

| Q             | A
| ------------- | ---
| Branch?       | 5.1
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #38445
| License       | MIT
| Doc PR        | N/A

This PR will fix the issue by checking if the type is an array or not and setting the collection boolean based on this check.

Commits
-------

33d37e56ba Fix no collection in extract default value
This commit is contained in:
Fabien Potencier 2020-10-07 07:53:03 +02:00
commit 392f2e0ba2
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
View File

@ -477,8 +477,9 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp
}
$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

3
src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
View File

@ -257,7 +257,7 @@ class ReflectionExtractorTest extends TestCase
['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 @@ class ReflectionExtractorTest extends TestCase
$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'));
}
/**

1
src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php74Dummy.php
View File

@ -20,6 +20,7 @@ class Php74Dummy
private ?bool $nullableBoolProp;
/** @var string[] */
private array $stringCollection;
public array $collection = [];
public function addStringCollection(string $string): void
{