Invalidating expressions without regexes

src/Analyser/MutatingScope.php

@@ -25,6 +25,7 @@
 use PhpParser\Node\Scalar\EncapsedStringPart;
 use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Scalar\String_;
+use PhpParser\NodeFinder;
 use PHPStan\Node\ExecutionEndNode;
 use PHPStan\Parser\Parser;
 use PHPStan\Reflection\ClassMemberReflection;
@@ -3479,17 +3480,13 @@ public function unsetExpression(Expr $expr): self
 				);
 			}
 
-			$args = [new Node\Arg($expr->var)];
-
 			$arrays = TypeUtils::getArrays($varType);
 			$scope = $this;
 			if (count($arrays) > 0) {
 				$scope = $scope->specifyExpressionType($expr->var, TypeCombinator::union(...$arrays));
 			}
 
-			return $scope->invalidateExpression($expr->var)
-				->invalidateExpression(new FuncCall(new Name\FullyQualified('count'), $args))
-				->invalidateExpression(new FuncCall(new Name('count'), $args));
+			return $scope->invalidateExpression($expr->var);
 		}
 
 		return $this;
@@ -3609,28 +3606,25 @@ public function invalidateExpression(Expr $expressionToInvalidate, bool $require
 		$moreSpecificTypeHolders = $this->moreSpecificTypes;
 		$nativeExpressionTypes = $this->nativeExpressionTypes;
 		$invalidated = false;
+		$nodeFinder = new NodeFinder();
 		foreach (array_keys($moreSpecificTypeHolders) as $exprString) {
 			$exprString = (string) $exprString;
-			if (Strings::startsWith($exprString, $exprStringToInvalidate)) {
-				if ($exprString === $exprStringToInvalidate && $requireMoreCharacters) {
-					continue;
-				}
-				$nextLetter = substr($exprString, strlen($exprStringToInvalidate), 1);
-				if (Strings::match($nextLetter, '#[a-zA-Z_0-9\x7f-\xff]#') === null) {
-					unset($moreSpecificTypeHolders[$exprString]);
-					unset($nativeExpressionTypes[$exprString]);
-					$invalidated = true;
-					continue;
-				}
+			$expr = $this->parser->parseString('<?php ' . $exprString . ';')[0];
+			if (!$expr instanceof Node\Stmt\Expression) {
+				throw new \PHPStan\ShouldNotHappenException();
 			}
-			$matches = \Nette\Utils\Strings::matchAll($exprString, '#\$[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*#');
-			if ($matches === []) {
+			$found = $nodeFinder->findFirst([$expr->expr], function (Node $node) use ($exprStringToInvalidate): bool {
+				if (!$node instanceof Expr) {
+					return false;
+				}
+
+				return $this->getNodeKey($node) === $exprStringToInvalidate;
+			});
+			if ($found === null) {
 				continue;
 			}
 
-			$matches = array_column($matches, 0);
-
-			if (!in_array($exprStringToInvalidate, $matches, true)) {
+			if ($requireMoreCharacters && $exprString === $exprStringToInvalidate) {
 				continue;
 			}
 

src/Analyser/NodeScopeResolver.php

@@ -1858,9 +1858,7 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression
 			) {
 				$arrayArg = $expr->args[0]->value;
 				$constantArrays = TypeUtils::getConstantArrays($scope->getType($arrayArg));
-				$scope = $scope->invalidateExpression($arrayArg)
-					->invalidateExpression(new FuncCall(new Name\FullyQualified('count'), [$expr->args[0]]))
-					->invalidateExpression(new FuncCall(new Name('count'), [$expr->args[0]]));
+				$scope = $scope->invalidateExpression($arrayArg);
 				if (count($constantArrays) > 0) {
 					$resultArrayTypes = [];
 

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -442,6 +442,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-4415.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5259.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5293.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5129.php');
 	}
 
 	/**

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

@@ -0,0 +1,63 @@
+<?php
+
+namespace Bug5129;
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+
+	private $foo;
+
+	public function sayHello(string $s): void
+	{
+		$this->foo = '';
+		assertType('0', strlen($this->foo));
+		if (strlen($this->foo) > 0) {
+			return;
+		}
+
+		assertType('0', strlen($this->foo));
+
+		$this->foo = 'x';
+		assertType('int<1, max>', strlen($this->foo));
+		if (strlen($this->foo) > 0) {
+			return;
+		}
+
+		assertType('0', strlen($this->foo));
+
+		$this->foo = $s;
+		assertType('int<0, max>', strlen($this->foo));
+	}
+
+	public function sayHello2(string $s): void
+	{
+		$this->foo = '';
+		if (!$this->isFoo($this->foo)) {
+			return;
+		}
+
+		assertType('true', $this->isFoo($this->foo));
+
+		$this->foo = 'x';
+		assertType('bool', $this->isFoo($this->foo));
+		if (!$this->isFoo($this->foo)) {
+			return;
+		}
+		assertType('true', $this->isFoo($this->foo));
+
+		$this->foo = $s;
+		assertType('bool', $this->isFoo($this->foo));
+		if (!$this->isFoo($this->foo)) {
+			return;
+		}
+		assertType('true', $this->isFoo($this->foo));
+	}
+
+	public function isFoo(string $s): bool
+	{
+		return strlen($s) % 3;
+	}
+
+}