Generalize scalar type when inferring properties

phpstan · Dec 10, 2019 · ad8d823 · ad8d823
1 parent 733509c
commit ad8d823
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/Reflection/Php/PhpClassReflectionExtension.php b/src/Reflection/Php/PhpClassReflectionExtension.php
@@ -39,6 +39,7 @@
 use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypehintHelper;
+use PHPStan\Type\TypeUtils;
 
 class PhpClassReflectionExtension
 	implements PropertiesClassReflectionExtension, MethodsClassReflectionExtension, BrokerAwareExtension
@@ -764,7 +765,7 @@ private function inferAndCachePropertyTypes(
 				continue;
 			}
 
-			$propertyTypes[$propertyFetch->name->toString()] = $propertyType;
+			$propertyTypes[$propertyFetch->name->toString()] = TypeUtils::generalizeType($propertyType);
 		}
 
 		return $this->propertyTypesCache[$declaringClass->getName()] = $propertyTypes;

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -9737,6 +9737,14 @@ public function dataInferPrivatePropertyTypeFromConstructor(): array
 				'mixed',
 				'$this->explicitMixed',
 			],
+			[
+				'bool',
+				'$this->bool',
+			],
+			[
+				'array',
+				'$this->array',
+			],
 		];
 	}
 

diff --git a/tests/PHPStan/Analyser/data/infer-private-property-type-from-constructor.php b/tests/PHPStan/Analyser/data/infer-private-property-type-from-constructor.php
@@ -20,6 +20,10 @@ class Foo
 	/** @var mixed */
 	private $explicitMixed;
 
+	private $bool;
+
+	private $array;
+
 	/**
 	 * @param self|Bar $unionProp
 	 */
@@ -37,6 +41,8 @@ public function __construct(
 		$this->stdClassProp = new \stdClass();
 		$this->unrelatedDocComment = $unrelatedDocComment;
 		$this->explicitMixed = $explicitMixed;
+		$this->bool = false;
+		$this->array = [];
 	}
 
 	public function doFoo()