Merge branch 2.1.x into 2.2.x

phpstan-bot · phpstan-bot · commit ff9424d9886a · 2026-05-07T19:27:13.000Z
diff --git a/src/Analyser/ExprHandler/FuncCallHandler.php b/src/Analyser/ExprHandler/FuncCallHandler.php
@@ -60,7 +60,6 @@
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
-use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\UnionType;
 use Throwable;
 use function array_filter;
@@ -274,8 +273,10 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 		$isAlwaysTerminating = $isAlwaysTerminating || $argsResult->isAlwaysTerminating();
 
 		if ($arrayWalkValueTypes !== null && $arrayWalkArrayArg !== null) {
-			$newArrayType = $this->getArrayWalkResultType($arrayWalkOriginalArrayType, $arrayWalkValueTypes[0]);
-			$newArrayNativeType = $this->getArrayWalkResultType($arrayWalkOriginalArrayNativeType, $arrayWalkValueTypes[1]);
+			$arrayWalkValueType = $arrayWalkValueTypes[0];
+			$arrayWalkValueNativeType = $arrayWalkValueTypes[1];
+			$newArrayType = $arrayWalkOriginalArrayType->mapValueType(static fn (Type $type): Type => $arrayWalkValueType);
+			$newArrayNativeType = $arrayWalkOriginalArrayNativeType->mapValueType(static fn (Type $type): Type => $arrayWalkValueNativeType);
 
 			$scope = $nodeScopeResolver->processVirtualAssign(
 				$scope,
@@ -462,7 +463,7 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 				$storage,
 				$stmt,
 				$arrayArg,
-				new NativeTypeExpr($this->getArraySortPreserveListFunctionType($scope->getType($arrayArg)), $this->getArraySortPreserveListFunctionType($scope->getNativeType($arrayArg))),
+				new NativeTypeExpr($scope->getType($arrayArg)->sortArray(), $scope->getNativeType($arrayArg)->sortArray()),
 				$nodeCallback,
 			)->getScope();
 		}
@@ -479,7 +480,7 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 				$storage,
 				$stmt,
 				$arrayArg,
-				new NativeTypeExpr($this->getArraySortDoNotPreserveListFunctionType($scope->getType($arrayArg)), $this->getArraySortDoNotPreserveListFunctionType($scope->getNativeType($arrayArg))),
+				new NativeTypeExpr($scope->getType($arrayArg)->makeListMaybe(), $scope->getNativeType($arrayArg)->makeListMaybe()),
 				$nodeCallback,
 			)->getScope();
 		}
@@ -722,41 +723,6 @@ static function (?Type $offsetType, Type $valueType, bool $optional) use (&$arra
 		return $arrayType;
 	}
 
-	private function getArraySortPreserveListFunctionType(Type $type): Type
-	{
-		$isIterableAtLeastOnce = $type->isIterableAtLeastOnce();
-		if ($isIterableAtLeastOnce->no()) {
-			return $type;
-		}
-
-		return TypeTraverser::map($type, static function (Type $type, callable $traverse) use ($isIterableAtLeastOnce): Type {
-			if ($type instanceof UnionType || $type instanceof IntersectionType) {
-				return $traverse($type);
-			}
-
-			if (!$type instanceof ArrayType && !$type instanceof ConstantArrayType) {
-				return $type;
-			}
-
-			$newArrayType = new IntersectionType([new ArrayType(IntegerRangeType::createAllGreaterThanOrEqualTo(0), $type->getIterableValueType()), new AccessoryArrayListType()]);
-			if ($isIterableAtLeastOnce->yes()) {
-				$newArrayType = TypeCombinator::intersect($newArrayType, new NonEmptyArrayType());
-			}
-
-			return $newArrayType;
-		});
-	}
-
-	private function getArraySortDoNotPreserveListFunctionType(Type $type): Type
-	{
-		return $type->makeListMaybe();
-	}
-
-	private function getArrayWalkResultType(Type $arrayType, Type $newValueType): Type
-	{
-		return $arrayType->mapValueType(static fn (Type $type): Type => $newValueType);
-	}
-
 	public function resolveType(MutatingScope $scope, Expr $expr): Type
 	{
 		if ($expr->name instanceof Expr) {
diff --git a/src/Analyser/ExprHandler/InstanceofHandler.php b/src/Analyser/ExprHandler/InstanceofHandler.php
@@ -91,8 +91,7 @@ public function resolveType(MutatingScope $scope, Expr $expr): Type
 				$classType = new ObjectType($className);
 			}
 		} else {
-			$classType = $scope->getType($expr->class);
-			$result = $classType->toObjectTypeForInstanceofCheck();
+			$result = $scope->getType($expr->class)->toObjectTypeForInstanceofCheck();
 			$classType = $result->type;
 			$uncertainty = $result->uncertainty;
 		}
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -164,8 +164,7 @@ public function specifyTypesInCondition(
 				return $this->create($exprNode, $type, $context, $scope)->setRootExpr($expr);
 			}
 
-			$classType = $scope->getType($expr->class);
-			$result = $classType->toObjectTypeForInstanceofCheck();
+			$result = $scope->getType($expr->class)->toObjectTypeForInstanceofCheck();
 			$type = $result->type;
 			$uncertainty = $result->uncertainty;
 
diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -242,6 +242,11 @@ public function shuffleArray(): Type
 		return $this;
 	}
 
+	public function sortArray(): Type
+	{
+		return $this;
+	}
+
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
 		if ($preserveKeys->no()) {
diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -202,6 +202,11 @@ public function shuffleArray(): Type
 		return new NonEmptyArrayType();
 	}
 
+	public function sortArray(): Type
+	{
+		return $this;
+	}
+
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
 		if (
diff --git a/src/Type/Accessory/HasOffsetValueType.php b/src/Type/Accessory/HasOffsetValueType.php
@@ -291,6 +291,11 @@ public function shuffleArray(): Type
 		return new NonEmptyArrayType();
 	}
 
+	public function sortArray(): Type
+	{
+		return $this;
+	}
+
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
 		if (
diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -226,6 +226,11 @@ public function shuffleArray(): Type
 		return $this;
 	}
 
+	public function sortArray(): Type
+	{
+		return $this;
+	}
+
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
 		if ((new ConstantIntegerType(0))->isSuperTypeOf($offsetType)->yes() && $lengthType->isNull()->yes()) {
diff --git a/src/Type/Accessory/OversizedArrayType.php b/src/Type/Accessory/OversizedArrayType.php
@@ -214,6 +214,11 @@ public function shuffleArray(): Type
 		return $this;
 	}
 
+	public function sortArray(): Type
+	{
+		return $this;
+	}
+
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
 		return $this;
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -1171,6 +1171,11 @@ public function shuffleArray(): Type
 		return $this->intersectTypes(static fn (Type $type): Type => $type->shuffleArray());
 	}
 
+	public function sortArray(): Type
+	{
+		return $this->intersectTypes(static fn (Type $type): Type => $type->sortArray());
+	}
+
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
 		$result = $this->intersectTypes(static fn (Type $type): Type => $type->sliceArray($offsetType, $lengthType, $preserveKeys));
diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -289,6 +289,11 @@ public function shuffleArray(): Type
 		return new IntersectionType([new ArrayType(IntegerRangeType::createAllGreaterThanOrEqualTo(0), new MixedType($this->isExplicitMixed)), new AccessoryArrayListType()]);
 	}
 
+	public function sortArray(): Type
+	{
+		return $this;
+	}
+
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
 		if ($this->isArray()->no()) {
diff --git a/src/Type/NeverType.php b/src/Type/NeverType.php
@@ -375,6 +375,11 @@ public function shuffleArray(): Type
 		return new NeverType();
 	}
 
+	public function sortArray(): Type
+	{
+		return $this;
+	}
+
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
 		return new NeverType();
diff --git a/src/Type/StaticType.php b/src/Type/StaticType.php
@@ -550,6 +550,11 @@ public function shuffleArray(): Type
 		return $this->getStaticObjectType()->shuffleArray();
 	}
 
+	public function sortArray(): Type
+	{
+		return $this;
+	}
+
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
 		return $this->getStaticObjectType()->sliceArray($offsetType, $lengthType, $preserveKeys);
diff --git a/src/Type/Traits/ArrayTypeTrait.php b/src/Type/Traits/ArrayTypeTrait.php
@@ -219,4 +219,23 @@ public function chunkArray(Type $lengthType, TrinaryLogic $preserveKeys): Type
 			: $arrayType;
 	}
 
+	public function sortArray(): Type
+	{
+		$isIterableAtLeastOnce = $this->isIterableAtLeastOnce();
+		if ($isIterableAtLeastOnce->no()) {
+			return $this;
+		}
+
+		$listType = new IntersectionType([
+			new ArrayType(IntegerRangeType::createAllGreaterThanOrEqualTo(0), $this->getIterableValueType()),
+			new AccessoryArrayListType(),
+		]);
+
+		if ($isIterableAtLeastOnce->yes()) {
+			$listType = TypeCombinator::intersect($listType, new NonEmptyArrayType());
+		}
+
+		return $listType;
+	}
+
 }
diff --git a/src/Type/Traits/LateResolvableTypeTrait.php b/src/Type/Traits/LateResolvableTypeTrait.php
@@ -346,6 +346,11 @@ public function shuffleArray(): Type
 		return $this->resolve()->shuffleArray();
 	}
 
+	public function sortArray(): Type
+	{
+		return $this->resolve()->sortArray();
+	}
+
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
 		return $this->resolve()->sliceArray($offsetType, $lengthType, $preserveKeys);
diff --git a/src/Type/Traits/MaybeArrayTypeTrait.php b/src/Type/Traits/MaybeArrayTypeTrait.php
@@ -99,6 +99,11 @@ public function shuffleArray(): Type
 		return new ErrorType();
 	}
 
+	public function sortArray(): Type
+	{
+		return $this;
+	}
+
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
 		return new ErrorType();
diff --git a/src/Type/Traits/NonArrayTypeTrait.php b/src/Type/Traits/NonArrayTypeTrait.php
@@ -99,6 +99,11 @@ public function shuffleArray(): Type
 		return new ErrorType();
 	}
 
+	public function sortArray(): Type
+	{
+		return $this;
+	}
+
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
 		return new ErrorType();
diff --git a/src/Type/Type.php b/src/Type/Type.php
@@ -273,6 +273,14 @@ public function shiftArray(): Type;
 	/** Models shuffle() effect on the array. Result is always a list. */
 	public function shuffleArray(): Type;
 
+	/**
+	 * Models `sort` / `rsort` / `usort`: values are reordered and the array
+	 * is re-indexed as a list. Empty arrays stay empty; non-array leaves
+	 * pass through unchanged (the call site is responsible for arg-type
+	 * checks).
+	 */
+	public function sortArray(): Type;
+
 	/** Models array_slice($array, $offset, $length, $preserveKeys). */
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type;
 
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -900,6 +900,11 @@ public function shuffleArray(): Type
 		return $this->unionTypes(static fn (Type $type): Type => $type->shuffleArray());
 	}
 
+	public function sortArray(): Type
+	{
+		return $this->unionTypes(static fn (Type $type): Type => $type->sortArray());
+	}
+
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
 		return $this->unionTypes(static fn (Type $type): Type => $type->sliceArray($offsetType, $lengthType, $preserveKeys));

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,7 @@ public function resolveType(MutatingScope $scope, Expr $expr): Type`
`91`	`91`	`$classType = new ObjectType($className);`
`92`	`92`	`}`
`93`	`93`	`} else {`
`94`		`- $classType = $scope->getType($expr->class);`
`95`		`- $result = $classType->toObjectTypeForInstanceofCheck();`
	`94`	`+ $result = $scope->getType($expr->class)->toObjectTypeForInstanceofCheck();`
`96`	`95`	`$classType = $result->type;`
`97`	`96`	`$uncertainty = $result->uncertainty;`
`98`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,8 +164,7 @@ public function specifyTypesInCondition(`
`164`	`164`	`return $this->create($exprNode, $type, $context, $scope)->setRootExpr($expr);`
`165`	`165`	`}`
`166`	`166`
`167`		`- $classType = $scope->getType($expr->class);`
`168`		`- $result = $classType->toObjectTypeForInstanceofCheck();`
	`167`	`+ $result = $scope->getType($expr->class)->toObjectTypeForInstanceofCheck();`
`169`	`168`	`$type = $result->type;`
`170`	`169`	`$uncertainty = $result->uncertainty;`
`171`	`170`
Original file line number	Diff line number	Diff line change
`@@ -242,6 +242,11 @@ public function shuffleArray(): Type`
`242`	`242`	`return $this;`
`243`	`243`	`}`
`244`	`244`
	`245`	`+ public function sortArray(): Type`
	`246`	`+ {`
	`247`	`+ return $this;`
	`248`	`+ }`
	`249`	`+`
`245`	`250`	`public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type`
`246`	`251`	`{`
`247`	`252`	`if ($preserveKeys->no()) {`
Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,11 @@ public function shuffleArray(): Type`
`202`	`202`	`return new NonEmptyArrayType();`
`203`	`203`	`}`
`204`	`204`
	`205`	`+ public function sortArray(): Type`
	`206`	`+ {`
	`207`	`+ return $this;`
	`208`	`+ }`
	`209`	`+`
`205`	`210`	`public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type`
`206`	`211`	`{`
`207`	`212`	`if (`
Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,11 @@ public function shuffleArray(): Type`
`291`	`291`	`return new NonEmptyArrayType();`
`292`	`292`	`}`
`293`	`293`
	`294`	`+ public function sortArray(): Type`
	`295`	`+ {`
	`296`	`+ return $this;`
	`297`	`+ }`
	`298`	`+`
`294`	`299`	`public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type`
`295`	`300`	`{`
`296`	`301`	`if (`
Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,11 @@ public function shuffleArray(): Type`
`226`	`226`	`return $this;`
`227`	`227`	`}`
`228`	`228`
	`229`	`+ public function sortArray(): Type`
	`230`	`+ {`
	`231`	`+ return $this;`
	`232`	`+ }`
	`233`	`+`
`229`	`234`	`public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type`
`230`	`235`	`{`
`231`	`236`	`if ((new ConstantIntegerType(0))->isSuperTypeOf($offsetType)->yes() && $lengthType->isNull()->yes()) {`
Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,11 @@ public function shuffleArray(): Type`
`214`	`214`	`return $this;`
`215`	`215`	`}`
`216`	`216`
	`217`	`+ public function sortArray(): Type`
	`218`	`+ {`
	`219`	`+ return $this;`
	`220`	`+ }`
	`221`	`+`
`217`	`222`	`public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type`
`218`	`223`	`{`
`219`	`224`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -1171,6 +1171,11 @@ public function shuffleArray(): Type`
`1171`	`1171`	`return $this->intersectTypes(static fn (Type $type): Type => $type->shuffleArray());`
`1172`	`1172`	`}`
`1173`	`1173`
	`1174`	`+ public function sortArray(): Type`
	`1175`	`+ {`
	`1176`	`+ return $this->intersectTypes(static fn (Type $type): Type => $type->sortArray());`
	`1177`	`+ }`
	`1178`	`+`
`1174`	`1179`	`public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type`
`1175`	`1180`	`{`
`1176`	`1181`	`$result = $this->intersectTypes(static fn (Type $type): Type => $type->sliceArray($offsetType, $lengthType, $preserveKeys));`
Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,11 @@ public function shuffleArray(): Type`
`289`	`289`	`return new IntersectionType([new ArrayType(IntegerRangeType::createAllGreaterThanOrEqualTo(0), new MixedType($this->isExplicitMixed)), new AccessoryArrayListType()]);`
`290`	`290`	`}`
`291`	`291`
	`292`	`+ public function sortArray(): Type`
	`293`	`+ {`
	`294`	`+ return $this;`
	`295`	`+ }`
	`296`	`+`
`292`	`297`	`public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type`
`293`	`298`	`{`
`294`	`299`	`if ($this->isArray()->no()) {`