Invalidate array type info when using array_{push,pop,shift,unshift}

cs278 · ondrejmirtes · commit b1fd47bda2a7 · 2020-01-14T22:43:23.000+01:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -1374,14 +1374,14 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression
 						}
 					}
 
-					$scope = $scope->specifyExpressionType(
+					$scope = $scope->invalidateExpression($arrayArg)->specifyExpressionType(
 						$arrayArg,
 						TypeCombinator::union(...$resultArrayTypes)
 					);
 				} else {
 					$arrays = TypeUtils::getAnyArrays($scope->getType($arrayArg));
 					if (count($arrays) > 0) {
-						$scope = $scope->specifyExpressionType($arrayArg, TypeCombinator::union(...$arrays));
+						$scope = $scope->invalidateExpression($arrayArg)->specifyExpressionType($arrayArg, TypeCombinator::union(...$arrays));
 					}
 				}
 			}
@@ -1421,7 +1421,7 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression
 						$arrayType = $arrayType->setOffsetValueType(null, $argType);
 					}
 
-					$scope = $scope->specifyExpressionType($arrayArg, TypeCombinator::intersect($arrayType, new NonEmptyArrayType()));
+					$scope = $scope->invalidateExpression($arrayArg)->specifyExpressionType($arrayArg, TypeCombinator::intersect($arrayType, new NonEmptyArrayType()));
 				} elseif (count($constantArrays) > 0) {
 					$defaultArrayBuilder = ConstantArrayTypeBuilder::createEmpty();
 					foreach ($argumentTypes as $argType) {
@@ -1443,7 +1443,7 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression
 						$arrayTypes[] = $arrayType;
 					}
 
-					$scope = $scope->specifyExpressionType(
+					$scope = $scope->invalidateExpression($arrayArg)->specifyExpressionType(
 						$arrayArg,
 						TypeCombinator::union(...$arrayTypes)
 					);
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -9762,6 +9762,11 @@ public function dataBug2443(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/bug-2443.php');
 	}
 
+	public function dataBug2750(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug-2750.php');
+	}
+
 	/**
 	 * @dataProvider dataBug2574
 	 * @dataProvider dataBug2577
@@ -9787,6 +9792,7 @@ public function dataBug2443(): array
 	 * @dataProvider dataBug2822
 	 * @dataProvider dataBug2835
 	 * @dataProvider dataBug2443
+	 * @dataProvider dataBug2750
 	 * @param ConstantStringType $expectedType
 	 * @param Type $actualType
 	 */
diff --git a/tests/PHPStan/Analyser/data/bug-2750.php b/tests/PHPStan/Analyser/data/bug-2750.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Analyser\Bug2750;
+
+use function PHPStan\Analyser\assertType;
+
+function (array $input) {
+	\assert(count($input) > 0);
+	assertType('int<1, max>', count($input));
+	array_shift($input);
+	assertType('int', count($input));
+
+	\assert(count($input) > 0);
+	assertType('int<1, max>', count($input));
+	array_pop($input);
+	assertType('int', count($input));
+
+	\assert(count($input) > 0);
+	assertType('int<1, max>', count($input));
+	array_unshift($input, 'test');
+	assertType('int', count($input));
+
+	\assert(count($input) > 0);
+	assertType('int<1, max>', count($input));
+	array_push($input, 'nope');
+	assertType('int', count($input));
+};

Original file line number	Diff line number	Diff line change
`@@ -1374,14 +1374,14 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression`
`1374`	`1374`	`}`
`1375`	`1375`	`}`
`1376`	`1376`
`1377`		`- $scope = $scope->specifyExpressionType(`
	`1377`	`+ $scope = $scope->invalidateExpression($arrayArg)->specifyExpressionType(`
`1378`	`1378`	`$arrayArg,`
`1379`	`1379`	`TypeCombinator::union(...$resultArrayTypes)`
`1380`	`1380`	`);`
`1381`	`1381`	`} else {`
`1382`	`1382`	`$arrays = TypeUtils::getAnyArrays($scope->getType($arrayArg));`
`1383`	`1383`	`if (count($arrays) > 0) {`
`1384`		`- $scope = $scope->specifyExpressionType($arrayArg, TypeCombinator::union(...$arrays));`
	`1384`	`+ $scope = $scope->invalidateExpression($arrayArg)->specifyExpressionType($arrayArg, TypeCombinator::union(...$arrays));`
`1385`	`1385`	`}`
`1386`	`1386`	`}`
`1387`	`1387`	`}`
`@@ -1421,7 +1421,7 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression`
`1421`	`1421`	`$arrayType = $arrayType->setOffsetValueType(null, $argType);`
`1422`	`1422`	`}`
`1423`	`1423`
`1424`		`- $scope = $scope->specifyExpressionType($arrayArg, TypeCombinator::intersect($arrayType, new NonEmptyArrayType()));`
	`1424`	`+ $scope = $scope->invalidateExpression($arrayArg)->specifyExpressionType($arrayArg, TypeCombinator::intersect($arrayType, new NonEmptyArrayType()));`
`1425`	`1425`	`} elseif (count($constantArrays) > 0) {`
`1426`	`1426`	`$defaultArrayBuilder = ConstantArrayTypeBuilder::createEmpty();`
`1427`	`1427`	`foreach ($argumentTypes as $argType) {`
`@@ -1443,7 +1443,7 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression`
`1443`	`1443`	`$arrayTypes[] = $arrayType;`
`1444`	`1444`	`}`
`1445`	`1445`
`1446`		`- $scope = $scope->specifyExpressionType(`
	`1446`	`+ $scope = $scope->invalidateExpression($arrayArg)->specifyExpressionType(`
`1447`	`1447`	`$arrayArg,`
`1448`	`1448`	`TypeCombinator::union(...$arrayTypes)`
`1449`	`1449`	`);`