array_shift() should invalidate remembered count() call

ondrejmirtes · ondrejmirtes · commit 26d29ec60222 · 2020-10-24T16:53:54.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -1478,6 +1478,7 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression
 			) {
 				$arrayArg = $expr->args[0]->value;
 				$constantArrays = TypeUtils::getConstantArrays($scope->getType($arrayArg));
+				$scope = $scope->invalidateExpression($arrayArg);
 				if (count($constantArrays) > 0) {
 					$resultArrayTypes = [];
 
@@ -1489,14 +1490,14 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression
 						}
 					}
 
-					$scope = $scope->invalidateExpression($arrayArg)->specifyExpressionType(
+					$scope = $scope->specifyExpressionType(
 						$arrayArg,
 						TypeCombinator::union(...$resultArrayTypes)
 					);
 				} else {
 					$arrays = TypeUtils::getAnyArrays($scope->getType($arrayArg));
 					if (count($arrays) > 0) {
-						$scope = $scope->invalidateExpression($arrayArg)->specifyExpressionType($arrayArg, TypeCombinator::union(...$arrays));
+						$scope = $scope->specifyExpressionType($arrayArg, TypeCombinator::union(...$arrays));
 					}
 				}
 			}
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -10240,6 +10240,11 @@ public function dataBug3991(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/bug-3991.php');
 	}
 
+	public function dataBug3993(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug-3993.php');
+	}
+
 	/**
 	 * @dataProvider dataBug2574
 	 * @dataProvider dataBug2577
@@ -10330,6 +10335,7 @@ public function dataBug3991(): array
 	 * @dataProvider dataArraySliceNonEmpty
 	 * @dataProvider dataBug3990
 	 * @dataProvider dataBug3991
+	 * @dataProvider dataBug3993
 	 * @param string $assertType
 	 * @param string $file
 	 * @param mixed ...$args
diff --git a/tests/PHPStan/Analyser/data/bug-3993.php b/tests/PHPStan/Analyser/data/bug-3993.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Bug3993;
+
+use function PHPStan\Analyser\assertType;
+
+class Foo
+{
+
+	public function doFoo($arguments)
+	{
+		if (!isset($arguments) || count($arguments) === 0) {
+			return;
+		}
+
+		assertType('mixed~null', $arguments);
+
+		array_shift($arguments);
+
+		assertType('mixed~null', $arguments);
+		assertType('int<0, max>', count($arguments));
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -1478,6 +1478,7 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression`
`1478`	`1478`	`) {`
`1479`	`1479`	`$arrayArg = $expr->args[0]->value;`
`1480`	`1480`	`$constantArrays = TypeUtils::getConstantArrays($scope->getType($arrayArg));`
	`1481`	`+ $scope = $scope->invalidateExpression($arrayArg);`
`1481`	`1482`	`if (count($constantArrays) > 0) {`
`1482`	`1483`	`$resultArrayTypes = [];`
`1483`	`1484`
`@@ -1489,14 +1490,14 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression`
`1489`	`1490`	`}`
`1490`	`1491`	`}`
`1491`	`1492`
`1492`		`- $scope = $scope->invalidateExpression($arrayArg)->specifyExpressionType(`
	`1493`	`+ $scope = $scope->specifyExpressionType(`
`1493`	`1494`	`$arrayArg,`
`1494`	`1495`	`TypeCombinator::union(...$resultArrayTypes)`
`1495`	`1496`	`);`
`1496`	`1497`	`} else {`
`1497`	`1498`	`$arrays = TypeUtils::getAnyArrays($scope->getType($arrayArg));`
`1498`	`1499`	`if (count($arrays) > 0) {`
`1499`		`- $scope = $scope->invalidateExpression($arrayArg)->specifyExpressionType($arrayArg, TypeCombinator::union(...$arrays));`
	`1500`	`+ $scope = $scope->specifyExpressionType($arrayArg, TypeCombinator::union(...$arrays));`
`1500`	`1501`	`}`
`1501`	`1502`	`}`
`1502`	`1503`	`}`