[PropertyInfo] Combine default value logic with property type

maxim-dovydenok · maxim-dovydenok · commit 649ca46e613b · 2021-04-04T18:49:36.000+03:00
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -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;
@@ -312,17 +300,20 @@ 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
     {
-        $isNullable = false;
+        $isNullable = $this->isNullableProperty($class, $property);
 
         try {
             $reflectionClass = new \ReflectionClass($class);
 
             if (\PHP_VERSION_ID >= 70400) {
-                $type = $reflectionClass->getProperty($property)->getType();
+                $reflectionProperty = $reflectionClass->getProperty($property);
+                $reflectionPropertyType = $reflectionProperty->getType();
 
-                $isNullable = null !== $type && $type->allowsNull();
+                if (null !== $reflectionPropertyType && $types = $this->extractFromReflectionType($reflectionPropertyType, $reflectionProperty->getDeclaringClass())) {
+                    return $types;
+                }
             }
         } catch (\ReflectionException $e) {
             return null;
@@ -376,6 +367,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 {
