[BCB] ConstantArrayType no longer extends ArrayType

Author: ondrejmirtes

UPGRADING.md

@@ -203,6 +203,12 @@ If you want to change `$overwrite` or `$rootExpr` (previous parameters also used
 
 If you want to change `$overwrite` or `$rootExpr` (previous parameters also used to be accepted by the constructor), call `setAlwaysOverwriteTypes()` and `setRootExpr()`. These methods return a new object (SpecifiedTypes is immutable).
 
+### `ConstantArrayType` no longer extends `ArrayType`
+
+`Type::getArrays()` now returns `list<ArrayType|ConstantArrayType>`.
+
+Using `$type instanceof ArrayType` is [being deprecated anyway](https://phpstan.org/blog/why-is-instanceof-type-wrong-and-getting-deprecated) so the impact of this change should be minimal.
+
 ### Changed `TypeSpecifier::specifyTypesInCondition()`
 
 This method now longer accepts `Expr $rootExpr`. If you want to change it, call `setRootExpr()` on [`SpecifiedTypes`](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.SpecifiedTypes.html) (object returned by `TypeSpecifier::specifyTypesInCondition()`). `setRootExpr()` method returns a new object (SpecifiedTypes is immutable).

phpstan-baseline.neon

@@ -175,6 +175,11 @@ parameters:
 			count: 1
 			path: src/PhpDoc/TypeNodeResolver.php
 
+		-
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantArrayType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantArrays\\(\\) instead\\.$#"
+			count: 1
+			path: src/PhpDoc/TypeNodeResolver.php
+
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\IterableType is error\\-prone and deprecated\\. Use Type\\:\\:isIterable\\(\\) instead\\.$#"
 			count: 1
@@ -505,6 +510,11 @@ parameters:
 			count: 1
 			path: src/Rules/Methods/MethodParameterComparisonHelper.php
 
+		-
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantArrayType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantArrays\\(\\) instead\\.$#"
+			count: 1
+			path: src/Rules/Methods/MethodParameterComparisonHelper.php
+
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\IterableType is error\\-prone and deprecated\\. Use Type\\:\\:isIterable\\(\\) instead\\.$#"
 			count: 1
@@ -657,7 +667,7 @@ parameters:
 
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantArrayType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantArrays\\(\\) instead\\.$#"
-			count: 1
+			count: 2
 			path: src/Type/ArrayType.php
 
 		-
@@ -1392,7 +1402,7 @@ parameters:
 
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantArrayType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantArrays\\(\\) instead\\.$#"
-			count: 10
+			count: 14
 			path: src/Type/TypeCombinator.php
 
 		-
@@ -1465,6 +1475,11 @@ parameters:
 			count: 3
 			path: src/Type/TypehintHelper.php
 
+		-
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantArrayType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantArrays\\(\\) instead\\.$#"
+			count: 3
+			path: src/Type/TypehintHelper.php
+
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\IterableType is error\\-prone and deprecated\\. Use Type\\:\\:isIterable\\(\\) instead\\.$#"
 			count: 1

src/Analyser/NodeScopeResolver.php

@@ -3868,7 +3868,7 @@ private function getArraySortPreserveListFunctionType(Type $type): Type
 				return $traverse($type);
 			}
 
-			if (!$type instanceof ArrayType) {
+			if (!$type instanceof ArrayType && !$type instanceof ConstantArrayType) {
 				return $type;
 			}
 

src/PhpDoc/TypeNodeResolver.php

@@ -59,6 +59,7 @@
 use PHPStan\Type\ClosureType;
 use PHPStan\Type\ConditionalType;
 use PHPStan\Type\ConditionalTypeForParameter;
+use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantFloatType;
@@ -571,6 +572,8 @@ private function resolveUnionTypeNode(UnionTypeNode $typeNode, NameScope $nameSc
 					$type = new IntersectionType([$type, new IterableType(new MixedType(), $arrayTypeType)]);
 				} elseif ($type instanceof ArrayType) {
 					$type = new ArrayType(new MixedType(), $arrayTypeType);
+				} elseif ($type instanceof ConstantArrayType) {
+					$type = new ArrayType(new MixedType(), $arrayTypeType);
 				} elseif ($type instanceof IterableType) {
 					$type = new IterableType(new MixedType(), $arrayTypeType);
 				} else {

src/Rules/Methods/MethodParameterComparisonHelper.php

@@ -9,6 +9,7 @@
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\ArrayType;
+use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\IterableType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
@@ -392,6 +393,9 @@ private function isTypeCompatible(Type $methodParameterType, Type $prototypePara
 				if ($prototypeParameterType instanceof ArrayType) {
 					return true;
 				}
+				if ($prototypeParameterType instanceof ConstantArrayType) {
+					return true;
+				}
 				if ($prototypeParameterType->isObject()->yes() && $prototypeParameterType->getObjectClassNames() === [Traversable::class]) {
 					return true;
 				}