Fix processing switch with complex case conditions

ondrejmirtes · ondrejmirtes · commit f6b34f2ac86d · 2023-06-30T14:25:08.000+02:00
Closes phpstan/phpstan#5326
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -1188,7 +1188,7 @@ private function processStmtNode(
 					$scopeForBranches = $caseResult->getScope();
 					$hasYield = $hasYield || $caseResult->hasYield();
 					$throwPoints = array_merge($throwPoints, $caseResult->getThrowPoints());
-					$branchScope = $scopeForBranches->filterByTruthyValue($condExpr);
+					$branchScope = $caseResult->getTruthyScope()->filterByTruthyValue($condExpr);
 				} else {
 					$hasDefaultCase = true;
 					$branchScope = $scopeForBranches;
diff --git a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
@@ -3983,7 +3983,7 @@ public function testNotSwitchInstanceof(): void
 	{
 		$this->assertTypes(
 			__DIR__ . '/data/switch-instanceof-not.php',
-			'*ERROR*',
+			'*NEVER*',
 			'$foo',
 		);
 	}
diff --git a/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php b/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php
@@ -967,4 +967,13 @@ public function testBug9474(): void
 		$this->analyse([__DIR__ . '/data/bug-9474.php'], []);
 	}
 
+	public function testBug5326(): void
+	{
+		$this->cliArgumentsVariablesRegistered = true;
+		$this->polluteScopeWithLoopInitialAssignments = true;
+		$this->checkMaybeUndefinedVariables = true;
+		$this->polluteScopeWithAlwaysIterableForeach = true;
+		$this->analyse([__DIR__ . '/data/bug-5326.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Variables/data/bug-5326.php b/tests/PHPStan/Rules/Variables/data/bug-5326.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Bug5326;
+
+function normalize(string $value): string
+{
+	switch (true) {
+		case strpos($value, 'get_') === 0 && preg_match('/get_(\S+)/m', $value, $match) === 1:
+			return $match[1];
+		default:
+			return $value;
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -3983,7 +3983,7 @@ public function testNotSwitchInstanceof(): void`
`3983`	`3983`	`{`
`3984`	`3984`	`$this->assertTypes(`
`3985`	`3985`	`__DIR__ . '/data/switch-instanceof-not.php',`
`3986`		`- 'ERROR',`
	`3986`	`+ 'NEVER',`
`3987`	`3987`	`'$foo',`
`3988`	`3988`	`);`
`3989`	`3989`	`}`
Original file line number	Diff line number	Diff line change
`@@ -967,4 +967,13 @@ public function testBug9474(): void`
`967`	`967`	`$this->analyse([__DIR__ . '/data/bug-9474.php'], []);`
`968`	`968`	`}`
`969`	`969`
	`970`	`+ public function testBug5326(): void`
	`971`	`+ {`
	`972`	`+ $this->cliArgumentsVariablesRegistered = true;`
	`973`	`+ $this->polluteScopeWithLoopInitialAssignments = true;`
	`974`	`+ $this->checkMaybeUndefinedVariables = true;`
	`975`	`+ $this->polluteScopeWithAlwaysIterableForeach = true;`
	`976`	`+ $this->analyse([__DIR__ . '/data/bug-5326.php'], []);`
	`977`	`+ }`
	`978`	`+`
`970`	`979`	`}`