Non-empty parameter array might be empty in different environment

Author: ondrejmirtes

src/Type/Symfony/ParameterDynamicReturnTypeExtension.php

@@ -12,6 +12,7 @@
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
+use PHPStan\Type\ConstantType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerType;
@@ -99,27 +100,29 @@ private function getGetTypeFromMethodCall(
 		if ($parameterKey !== null) {
 			$parameter = $this->parameterMap->getParameter($parameterKey);
 			if ($parameter !== null) {
-				return TypeTraverser::map($scope->getTypeFromValue($parameter->getValue()), static function (\PHPStan\Type\Type $type, callable $traverse): Type {
-					if ($type instanceof \PHPStan\Type\ConstantType) {
-						$generalized = $type->generalize();
-						if ($generalized instanceof ConstantArrayType) {
-							if (count($generalized->getValueTypes()) !== 0) {
-								throw new \PHPStan\ShouldNotHappenException();
-							}
-
-							return new ArrayType(new MixedType(), new MixedType());
-						}
-
-						return $generalized;
-					}
-					return $traverse($type);
-				});
+				return $this->generalizeType($scope->getTypeFromValue($parameter->getValue()));
 			}
 		}
 
 		return $returnType;
 	}
 
+	private function generalizeType(Type $type): Type
+	{
+		return TypeTraverser::map($type, function (Type $type, callable $traverse): Type {
+			if ($type instanceof ConstantArrayType) {
+				if (count($type->getValueTypes()) === 0) {
+					return new ArrayType(new MixedType(), new MixedType());
+				}
+				return new ArrayType($this->generalizeType($type->getKeyType()), $this->generalizeType($type->getItemType()));
+			}
+			if ($type instanceof ConstantType) {
+				return $type->generalize();
+			}
+			return $traverse($type);
+		});
+	}
+
 	private function getHasTypeFromMethodCall(
 		MethodReflection $methodReflection,
 		MethodCall $methodCall,

tests/Type/Symfony/container.xml

@@ -31,6 +31,9 @@
         <parameter key="app.binary" type="binary">VGhpcyBpcyBhIEJlbGwgY2hhciAH</parameter>
         <parameter key="app.constant">Y-m-d\TH:i:sP</parameter>
 		<parameter key="test_collection" type="collection"/>
+		<parameter key="non_empty_collection" type="collection">
+			<parameter>value</parameter>
+		</parameter>
     </parameters>
 
     <services>

tests/Type/Symfony/data/ExampleAbstractController.php

@@ -49,22 +49,23 @@ public function parameters(ContainerInterface $container, ParameterBagInterface
 		assertType("string", $container->getParameter('app.boolean_as_string'));
 		assertType("string", $parameterBag->get('app.boolean_as_string'));
 		assertType("string", $this->getParameter('app.boolean_as_string'));
-		assertType("array<int, string>&nonEmpty", $container->getParameter('app.list'));
-		assertType("array<int, string>&nonEmpty", $parameterBag->get('app.list'));
-		assertType("array<int, string>&nonEmpty", $this->getParameter('app.list'));
-		assertType("array<int, array<string, string>&nonEmpty>&nonEmpty", $container->getParameter('app.list_of_list'));
-		assertType("array<int, array<string, string>&nonEmpty>&nonEmpty", $parameterBag->get('app.list_of_list'));
-		assertType("array<int, array<string, string>&nonEmpty>&nonEmpty", $this->getParameter('app.list_of_list'));
-		assertType("array<string, string>&nonEmpty", $container->getParameter('app.map'));
-		assertType("array<string, string>&nonEmpty", $parameterBag->get('app.map'));
-		assertType("array<string, string>&nonEmpty", $this->getParameter('app.map'));
+		assertType("array<int, string>", $container->getParameter('app.list'));
+		assertType("array<int, string>", $parameterBag->get('app.list'));
+		assertType("array<int, string>", $this->getParameter('app.list'));
+		assertType("array<int, array<string, string>>", $container->getParameter('app.list_of_list'));
+		assertType("array<int, array<string, string>>", $parameterBag->get('app.list_of_list'));
+		assertType("array<int, array<string, string>>", $this->getParameter('app.list_of_list'));
+		assertType("array<string, string>", $container->getParameter('app.map'));
+		assertType("array<string, string>", $parameterBag->get('app.map'));
+		assertType("array<string, string>", $this->getParameter('app.map'));
 		assertType("string", $container->getParameter('app.binary'));
 		assertType("string", $parameterBag->get('app.binary'));
 		assertType("string", $this->getParameter('app.binary'));
 		assertType("string", $container->getParameter('app.constant'));
 		assertType("string", $parameterBag->get('app.constant'));
 		assertType("string", $this->getParameter('app.constant'));
 		assertType("array", $this->getParameter('test_collection'));
+		assertType("array<int, string>", $this->getParameter('non_empty_collection'));
 
 		assertType('false', $container->hasParameter('unknown'));
 		assertType('false', $parameterBag->has('unknown'));