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

[PropertyInfo] Make ReflectionExtractor correctly extract nullability

Browse Source
This commit is contained in:
Maxim Dovydenok 2021-04-03 16:47:18 +03:00 committed by Nicolas Grekas
parent 2a3f9125e1
commit d5fce4c779
3 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,20 +154,8 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp
return $fromConstructor; return $fromConstructor;
} }
if ($fromDefaultValue = $this->extractFromDefaultValue($class, $property)) { if ($fromPropertyDeclaration = $this->extractFromPropertyDeclaration($class, $property)) {
return $fromDefaultValue; return $fromPropertyDeclaration;
}
if (\PHP_VERSION_ID >= 70400) {
try {
$reflectionProperty = new \ReflectionProperty($class, $property);
$type = $reflectionProperty->getType();
if (null !== $type && $types = $this->extractFromReflectionType($type, $reflectionProperty->getDeclaringClass())) {
return $types;
}
} catch (\ReflectionException $e) {
// noop
}
} }
return null; return null;
@ -312,10 +300,19 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp
return null; return null;
} }
private function extractFromDefaultValue(string $class, string $property): ?array private function extractFromPropertyDeclaration(string $class, string $property): ?array
{ {
try { try {
$reflectionClass = new \ReflectionClass($class); $reflectionClass = new \ReflectionClass($class);
if (\PHP_VERSION_ID >= 70400) {
$reflectionProperty = $reflectionClass->getProperty($property);
$reflectionPropertyType = $reflectionProperty->getType();
if (null !== $reflectionPropertyType && $types = $this->extractFromReflectionType($reflectionPropertyType, $reflectionProperty->getDeclaringClass())) {
return $types;
}
}
} catch (\ReflectionException $e) { } catch (\ReflectionException $e) {
return null; return null;
} }
@ -328,7 +325,7 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp
$type = \gettype($defaultValue); $type = \gettype($defaultValue);
return [new Type(static::MAP_TYPES[$type] ?? $type)]; return [new Type(static::MAP_TYPES[$type] ?? $type, $this->isNullableProperty($class, $property))];
} }
private function extractFromReflectionType(\ReflectionType $reflectionType, \ReflectionClass $declaringClass): array private function extractFromReflectionType(\ReflectionType $reflectionType, \ReflectionClass $declaringClass): array
@ -368,6 +365,25 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp
return $name; return $name;
} }
private function isNullableProperty(string $class, string $property): bool
{
try {
$reflectionProperty = new \ReflectionProperty($class, $property);
if (\PHP_VERSION_ID >= 70400) {
$reflectionPropertyType = $reflectionProperty->getType();
return null !== $reflectionPropertyType && $reflectionPropertyType->allowsNull();
}
return false;
} catch (\ReflectionException $e) {
// Return false if the property doesn't exist
}
return false;
}
private function isAllowedProperty(string $class, string $property): bool private function isAllowedProperty(string $class, string $property): bool
{ {
try { try {

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

@ -414,5 +414,6 @@ 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_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_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, 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'));
} }
} }

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

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