FiberScope - attempt to fix asking for types on mutated scope

ondrejmirtes · ondrejmirtes · commit f180591d88a4 · 2026-01-04T08:30:45.000+01:00
diff --git a/src/Analyser/Fiber/FiberScope.php b/src/Analyser/Fiber/FiberScope.php
@@ -123,6 +123,14 @@ public function filterByFalseyValue(Expr $expr): self
 
 	private function preprocessScope(MutatingScope $scope): Scope
 	{
+		if ($scope->getAnonymousFunctionReflection() !== $this->getAnonymousFunctionReflection()) {
+			return $this->toMutatingScope();
+		}
+
+		if ($scope->getFunction() !== $this->getFunction()) {
+			return $this->toMutatingScope();
+		}
+
 		if ($this->nativeTypesPromoted) {
 			$scope = $scope->doNotTreatPhpDocTypesAsCertain();
 		}

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,14 @@ public function filterByFalseyValue(Expr $expr): self`
`123`	`123`
`124`	`124`	`private function preprocessScope(MutatingScope $scope): Scope`
`125`	`125`	`{`
	`126`	`+ if ($scope->getAnonymousFunctionReflection() !== $this->getAnonymousFunctionReflection()) {`
	`127`	`+ return $this->toMutatingScope();`
	`128`	`+ }`
	`129`	`+`
	`130`	`+ if ($scope->getFunction() !== $this->getFunction()) {`
	`131`	`+ return $this->toMutatingScope();`
	`132`	`+ }`
	`133`	`+`
`126`	`134`	`if ($this->nativeTypesPromoted) {`
`127`	`135`	`$scope = $scope->doNotTreatPhpDocTypesAsCertain();`
`128`	`136`	`}`