Improve code in FilterVarArrayDynamicReturnTypeExtension

phpstan · Apr 12, 2023 · cd1adfd · cd1adfd
1 parent 0a39cca
commit cd1adfd
Showing 1 changed file with 18 additions and 24 deletions.
diff --git a/src/Type/Php/FilterVarArrayDynamicReturnTypeExtension.php b/src/Type/Php/FilterVarArrayDynamicReturnTypeExtension.php
@@ -11,6 +11,7 @@
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
 use PHPStan\Type\Constant\ConstantIntegerType;
+use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
@@ -45,8 +46,6 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 
 		$functionName = strtolower($functionReflection->getName());
 		$inputArgType = $scope->getType($functionCall->getArgs()[0]->value);
-
-		$inputArrayType = $inputArgType->getArrays()[0] ?? null;
 		$inputConstantArrayType = null;
 		if ($functionName === 'filter_var_array') {
 			if ($inputArgType->isArray()->no()) {
@@ -69,14 +68,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 
 			// Pragmatical solution since global expressions are not passed through the scope for performance reasons
 			// See https://github.com/phpstan/phpstan-src/pull/2012 for details
-			$inputArrayType = new ArrayType(new StringType(), new MixedType());
-		}
-
-		if ($inputArrayType === null) {
-			$inputArrayType = new ArrayType(new MixedType(), new MixedType());
-			if ($inputArgType->isSuperTypeOf($inputArrayType)->no()) {
-				return null;
-			}
+			$inputArgType = new ArrayType(new StringType(), new MixedType());
 		}
 
 		$filterArgType = $scope->getType($functionCall->getArgs()[1]->value);
@@ -90,11 +82,11 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			if ($inputConstantArrayType === null) {
 				$isList = $inputArgType->isList()->yes();
 				$valueType = $this->filterFunctionReturnTypeHelper->getType(
-					$inputArrayType->getItemType(),
+					$inputArgType->getIterableValueType(),
 					$filterArgType,
 					null,
 				);
-				$arrayType = new ArrayType($inputArrayType->getKeyType(), $valueType);
+				$arrayType = new ArrayType($inputArgType->getIterableKeyType(), $valueType);
 
 				return $isList ? AccessoryArrayListType::intersectWith($arrayType) : $arrayType;
 			}
@@ -116,11 +108,11 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			}
 		} elseif ($filterConstantArrayType === null) {
 			if ($inputConstantArrayType === null) {
-				$isList = $inputArrayType->isList()->yes();
-				$valueType = $this->filterFunctionReturnTypeHelper->getType($inputArrayType, $filterArgType, null);
+				$isList = $inputArgType->isList()->yes();
+				$valueType = $this->filterFunctionReturnTypeHelper->getType($inputArgType, $filterArgType, null);
 
 				$arrayType = new ArrayType(
-					$inputArrayType->getKeyType(),
+					$inputArgType->getIterableKeyType(),
 					$addEmpty ? TypeCombinator::addNull($valueType) : $valueType,
 				);
 
@@ -148,7 +140,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 				}
 			} else {
 				$optionalKeys = $filterKeysList;
-				$inputTypesMap = array_fill_keys($optionalKeys, $inputArrayType->getItemType());
+				$inputTypesMap = array_fill_keys($optionalKeys, $inputArgType->getIterableValueType());
 			}
 		}
 
@@ -184,21 +176,23 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 	/** @return array{?Type, ?Type} */
 	public function fetchFilter(Type $type): array
 	{
-		$constantType = $type->getConstantArrays()[0] ?? null;
+		if (!$type->isArray()->yes()) {
+			return [$type, null];
+		}
 
-		if ($constantType === null) {
+		$filterKey = new ConstantStringType('filter');
+		if (!$type->hasOffsetValueType($filterKey)->yes()) {
 			return [$type, null];
 		}
 
+		$filterOffsetType = $type->getOffsetValueType($filterKey);
 		$filterType = null;
-		foreach ($constantType->getKeyTypes() as $keyType) {
-			if ($keyType->getValue() === 'filter') {
-				$filterType = $constantType->getOffsetValueType($keyType)->getConstantScalarTypes()[0] ?? null;
-				break;
-			}
+
+		if (count($filterOffsetType->getConstantScalarTypes()) > 0) {
+			$filterType = TypeCombinator::union(...$filterOffsetType->getConstantScalarTypes());
 		}
 
-		return [$filterType, $constantType];
+		return [$filterType, $type];
 	}
 
 }