Fixed expression invalidation when ++ is involved

src/Analyser/MutatingScope.php

@@ -2574,26 +2574,31 @@ public function assignExpression(Expr $expr, Type $type): self
 		return $scope->specifyExpressionType($expr, $type);
 	}
 
-	public function invalidateExpression(Expr $expressionToInvalidate, bool $requireMoreCharacters = false): self
+	public function invalidateExpression(Expr $expressionToInvalidate): self
 	{
 		$exprStringToInvalidate = $this->printer->prettyPrintExpr($expressionToInvalidate);
 		$moreSpecificTypeHolders = $this->moreSpecificTypes;
 		foreach (array_keys($moreSpecificTypeHolders) as $exprString) {
 			$exprString = (string) $exprString;
-			if ($requireMoreCharacters && $exprString === $exprStringToInvalidate) {
-				continue;
+			if (Strings::startsWith($exprString, $exprStringToInvalidate)) {
+				if ($exprString === $exprStringToInvalidate) {
+					unset($moreSpecificTypeHolders[$exprString]);
+					continue;
+				}
+				$nextLetter = substr($exprString, strlen($exprStringToInvalidate), 1);
+				if (Strings::match($nextLetter, '#[a-zA-Z_0-9\x7f-\xff]#') === null) {
+					unset($moreSpecificTypeHolders[$exprString]);
+					continue;
+				}
 			}
-			if (!Strings::startsWith($exprString, $exprStringToInvalidate)) {
+			$matches = \Nette\Utils\Strings::matchAll($exprString, '#\$[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*#');
+			if ($matches === []) {
 				continue;
 			}
 
-			if ($exprString === $exprStringToInvalidate) {
-				unset($moreSpecificTypeHolders[$exprString]);
-				continue;
-			}
+			$matches = array_column($matches, 0);
 
-			$nextLetter = substr($exprString, strlen($exprStringToInvalidate), 1);
-			if (Strings::match($nextLetter, '#[a-zA-Z_0-9\x7f-\xff]#') !== null) {
+			if (!in_array($exprStringToInvalidate, $matches, true)) {
 				continue;
 			}
 

src/Analyser/NodeScopeResolver.php

@@ -1492,7 +1492,7 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression
 			$result = $this->processArgs($methodReflection, $parametersAcceptor, $expr->args, $scope, $nodeCallback, $context);
 			$scope = $result->getScope();
 			if ($methodReflection !== null && $methodReflection->hasSideEffects()->yes()) {
-				$scope = $scope->invalidateExpression($expr->var, true);
+				$scope = $scope->invalidateExpression($expr->var);
 			}
 			$hasYield = $hasYield || $result->hasYield();
 		} elseif ($expr instanceof StaticCall) {
@@ -1829,6 +1829,8 @@ static function (MutatingScope $scope): ExpressionResult {
 						},
 						false
 					)->getScope();
+				} else {
+					$scope = $scope->invalidateExpression($expr->var);
 				}
 			}
 		} elseif ($expr instanceof Ternary) {

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -9752,6 +9752,11 @@ public function dataListType(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/list-type.php');
 	}
 
+	public function dataBug2835(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug-2835.php');
+	}
+
 	/**
 	 * @dataProvider dataBug2574
 	 * @dataProvider dataBug2577
@@ -9775,6 +9780,7 @@ public function dataListType(): array
 	 * @dataProvider dataPhpDocInheritanceConstructors
 	 * @dataProvider dataListType
 	 * @dataProvider dataBug2822
+	 * @dataProvider dataBug2835
 	 * @param ConstantStringType $expectedType
 	 * @param Type $actualType
 	 */

tests/PHPStan/Analyser/data/bug-2835.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Bug2835AssertTypes;
+
+use function PHPStan\Analyser\assertType;
+
+class Foo
+{
+
+	/**
+	 * @param array<int, array> $tokens
+	 * @return bool
+	 */
+	public function doFoo(array $tokens): bool {
+		$i = 0;
+		while (isset($tokens[$i])) {
+			assertType('int', $i);
+			if ($tokens[$i]['code'] !== 1) {
+				assertType('mixed~1', $tokens[$i]['code']);
+				$i++;
+				assertType('int', $i);
+				assertType('mixed', $tokens[$i]['code']);
+				continue;
+			}
+			assertType('1', $tokens[$i]['code']);
+			$i++;
+			assertType('int', $i);
+			assertType('mixed', $tokens[$i]['code']);
+			if ($tokens[$i]['code'] !== 2) {
+				assertType('mixed~2', $tokens[$i]['code']);
+				$i++;
+				assertType('int', $i);
+				continue;
+			}
+			assertType('2', $tokens[$i]['code']);
+			return true;
+		}
+		return false;
+	}
+
+}

tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php

@@ -413,4 +413,10 @@ public function testStrictComparisonPropertyNativeTypesPhp74(): void
 		]);
 	}
 
+	public function testBug2835(): void
+	{
+		$this->checkAlwaysTrueStrictComparison = true;
+		$this->analyse([__DIR__ . '/data/bug-2835.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Comparison/data/bug-2835.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Bug2835;
+
+class Foo
+{
+
+	/**
+	 * @param array<int, array> $tokens
+	 * @return bool
+	 */
+	public function doFoo(array $tokens): bool {
+		$i = 0;
+		while (isset($tokens[$i])) {
+			if ($tokens[$i]['code'] !== 1) {
+				$i++;
+				continue;
+			}
+			$i++;
+			if ($tokens[$i]['code'] !== 2) {
+				$i++;
+				continue;
+			}
+			return true;
+		}
+		return false;
+	}
+
+}