Fix processing switch with complex case conditions

Closes phpstan/phpstan#5326
phpstan · Jun 30, 2023 · f6b34f2 · f6b34f2
1 parent faba805
commit f6b34f2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
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;
+	}
+}