Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[PropertyInfo] Make ReflectionExtractor correctly extract nullability #40699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2021
Merged

[PropertyInfo] Make ReflectionExtractor correctly extract nullability #40699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,20 +154,8 @@ public function getTypes($class, $property, array $context = []): ?array
return $fromConstructor;
}

if ($fromDefaultValue = $this->extractFromDefaultValue($class, $property)) {
return $fromDefaultValue;
}

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
}
if ($fromPropertyDeclaration = $this->extractFromPropertyDeclaration($class, $property)) {
return $fromPropertyDeclaration;
}

return null;
Expand Down Expand Up @@ -312,10 +300,19 @@ private function extractFromConstructor(string $class, string $property): ?array
return null;
}

private function extractFromDefaultValue(string $class, string $property): ?array
private function extractFromPropertyDeclaration(string $class, string $property): ?array
{
try {
$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) {
return null;
}
Expand All @@ -328,7 +325,7 @@ private function extractFromDefaultValue(string $class, string $property): ?arra

$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
Expand Down Expand Up @@ -368,6 +365,25 @@ private function resolveTypeName(string $name, \ReflectionClass $declaringClass)
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
{
try {
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,5 +414,6 @@ public function testTypedProperties()
$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_INT, true)], $this->extractor->getTypes(Php74Dummy::class, 'nullableWithDefault'));
}
}
1 change: 1 addition & 0 deletions src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php74Dummy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class Php74Dummy
private ?bool $nullableBoolProp;
/** @var string[] */
private array $stringCollection;
private ?int $nullableWithDefault = 1;

public function addStringCollection(string $string): void
{
Expand Down