[PropertyInfo] Make ReflectionExtractor correctly extract nullability

maxim-dovydenok · maxim-dovydenok · commit 0ed6766416aa · 2021-04-03T16:47:18.000+03:00
ReflectionExtractor was always returning isNullable: false if property had default value. After PHP 7.4 we can get isNullable from the typehint
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -314,8 +314,16 @@ private function extractFromConstructor(string $class, string $property): ?array
 
     private function extractFromDefaultValue(string $class, string $property): ?array
     {
+        $isNullable = false;
+
         try {
             $reflectionClass = new \ReflectionClass($class);
+
+            if (\PHP_VERSION_ID >= 70400) {
+                $type = $reflectionClass->getProperty($property)->getType();
+
+                $isNullable = null !== $type && $type->allowsNull();
+            }
         } catch (\ReflectionException $e) {
             return null;
         }
@@ -328,7 +336,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, $isNullable)];
     }
 
     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
@@ -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'));
     }
 }
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;
+    private ?int $nullableWithDefault = 1;
 
     public function addStringCollection(string $string): void
     {

Original file line number	Diff line number	Diff line change
`@@ -414,5 +414,6 @@ public function testTypedProperties()`
`414`	`414`	`$this->assertEquals([new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)], $this->extractor->getTypes(Php74Dummy::class, 'dummy'));`
`415`	`415`	`$this->assertEquals([new Type(Type::BUILTIN_TYPE_BOOL, true)], $this->extractor->getTypes(Php74Dummy::class, 'nullableBoolProp'));`
`416`	`416`	`$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'));`
	`417`	`+ $this->assertEquals([new Type(Type::BUILTIN_TYPE_INT, true)], $this->extractor->getTypes(Php74Dummy::class, 'nullableWithDefault'));`
`417`	`418`	`}`
`418`	`419`	`}`
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`	`+ private ?int $nullableWithDefault = 1;`
`23`	`24`
`24`	`25`	`public function addStringCollection(string $string): void`
`25`	`26`	`{`