ConstantArrayType::generalize() - empty array will remain ConstantArr…

…ayType
phpstan · Dec 10, 2019 · 3e4d7b3 · 3e4d7b3
1 parent 3dadf2a
commit 3e4d7b3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Reflection/Php/PhpClassReflectionExtension.php b/src/Reflection/Php/PhpClassReflectionExtension.php
@@ -31,6 +31,8 @@
 use PHPStan\Reflection\SignatureMap\ParameterSignature;
 use PHPStan\Reflection\SignatureMap\SignatureMapProvider;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\ArrayType;
+use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\FileTypeMapper;
 use PHPStan\Type\Generic\TemplateTypeHelper;
@@ -765,7 +767,12 @@ private function inferAndCachePropertyTypes(
 				continue;
 			}
 
-			$propertyTypes[$propertyFetch->name->toString()] = TypeUtils::generalizeType($propertyType);
+			$propertyType = TypeUtils::generalizeType($propertyType);
+			if ($propertyType instanceof ConstantArrayType) {
+				$propertyType = new ArrayType(new MixedType(true), new MixedType(true));
+			}
+
+			$propertyTypes[$propertyFetch->name->toString()] = $propertyType;
 		}
 
 		return $this->propertyTypesCache[$declaringClass->getName()] = $propertyTypes;

diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -404,6 +404,10 @@ public function toBoolean(): BooleanType
 
 	public function generalize(): Type
 	{
+		if (count($this->keyTypes) === 0) {
+			return $this;
+		}
+
 		return new ArrayType(
 			TypeUtils::generalizeType($this->getKeyType()),
 			$this->getItemType()