Get rid of last instanceof in extension

phpstan · Jan 4, 2025 · 75e06bd · 75e06bd
1 parent 4556931
commit 75e06bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1467,12 +1467,6 @@ parameters:
 			count: 1
 			path: src/Type/Php/ArrayKeyExistsFunctionTypeSpecifyingExtension.php
 
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantArrayType is error\-prone and deprecated\. Use Type\:\:getConstantArrays\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Type/Php/ArrayMergeFunctionDynamicReturnTypeExtension.php
-
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantBooleanType is error\-prone and deprecated\. Use Type\:\:isTrue\(\) or Type\:\:isFalse\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType

diff --git a/src/Type/Php/ArrayMergeFunctionDynamicReturnTypeExtension.php b/src/Type/Php/ArrayMergeFunctionDynamicReturnTypeExtension.php
@@ -45,8 +45,13 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			$argType = $scope->getType($arg->value);
 
 			if ($arg->unpack) {
-				if ($argType instanceof ConstantArrayType) {
-					$argTypesFound = $argType->getValueTypes();
+				if ($argType->isConstantArray()->yes()) {
+					$argTypesFound = [];
+					foreach ($argType->getConstantArrays() as $constantArray) {
+						foreach ($constantArray->getValueTypes() as $valueType) {
+							$argTypesFound[] = $valueType;
+						}
+					}
 				} else {
 					$argTypesFound = [$argType->getIterableValueType()];
 				}