Prevent unnecessary scope merging

staabm · ondrejmirtes · commit 7c49de5c4a75 · 2025-12-20T09:21:04.000+01:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -4816,7 +4816,7 @@ public function isInFirstLevelStatement(): bool
 
 	public function mergeWith(?self $otherScope): self
 	{
-		if ($otherScope === null) {
+		if ($otherScope === null || $this === $otherScope) {
 			return $this;
 		}
 		$ourExpressionTypes = $this->expressionTypes;

Original file line number	Diff line number	Diff line change
`@@ -4816,7 +4816,7 @@ public function isInFirstLevelStatement(): bool`
`4816`	`4816`
`4817`	`4817`	`public function mergeWith(?self $otherScope): self`
`4818`	`4818`	`{`
`4819`		`- if ($otherScope === null) {`
	`4819`	`+ if ($otherScope === null \|\| $this === $otherScope) {`
`4820`	`4820`	`return $this;`
`4821`	`4821`	`}`
`4822`	`4822`	`$ourExpressionTypes = $this->expressionTypes;`