Make Scope::canAnyVariableExist() part of the interface

ondrejmirtes · ondrejmirtes · commit 4b2854db38a8 · 2021-01-14T13:42:38.000+01:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -351,7 +351,7 @@ private function getVariableTypes(): array
 		return $this->variableTypes;
 	}
 
-	private function canAnyVariableExist(): bool
+	public function canAnyVariableExist(): bool
 	{
 		return ($this->function === null && !$this->isInAnonymousFunction()) || $this->afterExtractCall;
 	}
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -2745,7 +2745,7 @@ private function processStmtVarAnnotation(MutatingScope $scope, Node\Stmt $stmt,
 					continue;
 				}
 
-				if ($scope->getFunction() === null && !$scope->isInAnonymousFunction()) {
+				if ($scope->canAnyVariableExist()) {
 					$certainty = TrinaryLogic::createYes();
 				}
 
diff --git a/src/Analyser/Scope.php b/src/Analyser/Scope.php
@@ -39,6 +39,8 @@ public function hasVariableType(string $variableName): TrinaryLogic;
 
 	public function getVariableType(string $variableName): Type;
 
+	public function canAnyVariableExist(): bool;
+
 	/**
 	 * @return array<int, string>
 	 */

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ private function getVariableTypes(): array`
`351`	`351`	`return $this->variableTypes;`
`352`	`352`	`}`
`353`	`353`
`354`		`- private function canAnyVariableExist(): bool`
	`354`	`+ public function canAnyVariableExist(): bool`
`355`	`355`	`{`
`356`	`356`	`return ($this->function === null && !$this->isInAnonymousFunction()) \|\| $this->afterExtractCall;`
`357`	`357`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2745,7 +2745,7 @@ private function processStmtVarAnnotation(MutatingScope $scope, Node\Stmt $stmt,`
`2745`	`2745`	`continue;`
`2746`	`2746`	`}`
`2747`	`2747`
`2748`		`- if ($scope->getFunction() === null && !$scope->isInAnonymousFunction()) {`
	`2748`	`+ if ($scope->canAnyVariableExist()) {`
`2749`	`2749`	`$certainty = TrinaryLogic::createYes();`
`2750`	`2750`	`}`
`2751`	`2751`