Fixed invalidating function call to count() outside of namespaces

ondrejmirtes · ondrejmirtes · commit 81b1afa5fc5e · 2020-01-05T22:35:06.000+01:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -2503,7 +2503,11 @@ public function unsetExpression(Expr $expr): self
 				);
 			}
 
-			return $this->invalidateExpression($expr->var)->invalidateExpression(new FuncCall(new Name('count'), [new Node\Arg($expr->var)]));
+			$args = [new Node\Arg($expr->var)];
+
+			return $this->invalidateExpression($expr->var)
+				->invalidateExpression(new FuncCall(new Name\FullyQualified('count'), $args))
+				->invalidateExpression(new FuncCall(new Name('count'), $args));
 		}
 
 		return $this;
diff --git a/tests/PHPStan/Analyser/data/bug-2648.php b/tests/PHPStan/Analyser/data/bug-2648.php
@@ -34,6 +34,8 @@ public function doBar(array $list): void
 					assertType('int', count($list));
 				}
 
+				assertType('int', count($list));
+
 				if (count($list) === 1) {
 					assertType('int', count($list));
 					break;
diff --git a/tests/PHPStan/Rules/Comparison/NumberComparisonOperatorsConstantConditionRuleTest.php b/tests/PHPStan/Rules/Comparison/NumberComparisonOperatorsConstantConditionRuleTest.php
@@ -34,4 +34,14 @@ public function testRule(): void
 		]);
 	}
 
+	public function testBug2648(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-2648-rule.php'], []);
+	}
+
+	public function testBug2648Namespace(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-2648-namespace-rule.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Comparison/data/bug-2648-namespace-rule.php b/tests/PHPStan/Rules/Comparison/data/bug-2648-namespace-rule.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Bug2648Rule;
+
+/** @var array<string> $foo */
+$foo = $_GET['bar'];
+
+if (count($foo) > 0) {
+	foreach ($foo as $key => $value) {
+		unset($foo[$key]);
+	}
+
+	if(count($foo) > 0) {
+		// $foo is actually empty now
+	}
+}
diff --git a/tests/PHPStan/Rules/Comparison/data/bug-2648-rule.php b/tests/PHPStan/Rules/Comparison/data/bug-2648-rule.php
@@ -0,0 +1,14 @@
+<?php
+
+/** @var array<string> $foo */
+$foo = $_GET['bar'];
+
+if (count($foo) > 0) {
+	foreach ($foo as $key => $value) {
+		unset($foo[$key]);
+	}
+
+	if(count($foo) > 0) {
+		// $foo is actually empty now
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -2503,7 +2503,11 @@ public function unsetExpression(Expr $expr): self`
`2503`	`2503`	`);`
`2504`	`2504`	`}`
`2505`	`2505`
`2506`		`- return $this->invalidateExpression($expr->var)->invalidateExpression(new FuncCall(new Name('count'), [new Node\Arg($expr->var)]));`
	`2506`	`+ $args = [new Node\Arg($expr->var)];`
	`2507`	`+`
	`2508`	`+ return $this->invalidateExpression($expr->var)`
	`2509`	`+ ->invalidateExpression(new FuncCall(new Name\FullyQualified('count'), $args))`
	`2510`	`+ ->invalidateExpression(new FuncCall(new Name('count'), $args));`
`2507`	`2511`	`}`
`2508`	`2512`
`2509`	`2513`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ public function doBar(array $list): void`
`34`	`34`	`assertType('int', count($list));`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ assertType('int', count($list));`
	`38`	`+`
`37`	`39`	`if (count($list) === 1) {`
`38`	`40`	`assertType('int', count($list));`
`39`	`41`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,14 @@ public function testRule(): void`
`34`	`34`	`]);`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ public function testBug2648(): void`
	`38`	`+ {`
	`39`	`+ $this->analyse([__DIR__ . '/data/bug-2648-rule.php'], []);`
	`40`	`+ }`
	`41`	`+`
	`42`	`+ public function testBug2648Namespace(): void`
	`43`	`+ {`
	`44`	`+ $this->analyse([__DIR__ . '/data/bug-2648-namespace-rule.php'], []);`
	`45`	`+ }`
	`46`	`+`
`37`	`47`	`}`