Minor optimization

ondrejmirtes · ondrejmirtes · commit 21d86f067500 · 2026-01-05T17:56:05.000+01:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -4112,6 +4112,10 @@ public function exitExpressionAssign(Expr $expr): self
 	/** @api */
 	public function isInExpressionAssign(Expr $expr): bool
 	{
+		if (count($this->currentlyAssignedExpressions) === 0) {
+			return false;
+		}
+
 		$exprString = $this->getNodeKey($expr);
 		return array_key_exists($exprString, $this->currentlyAssignedExpressions);
 	}
@@ -4185,6 +4189,9 @@ public function unsetAllowedUndefinedExpression(Expr $expr): self
 	/** @api */
 	public function isUndefinedExpressionAllowed(Expr $expr): bool
 	{
+		if (count($this->currentlyAllowedUndefinedExpressions) === 0) {
+			return false;
+		}
 		$exprString = $this->getNodeKey($expr);
 		return array_key_exists($exprString, $this->currentlyAllowedUndefinedExpressions);
 	}
@@ -4480,13 +4487,14 @@ public function invalidateExpression(Expr $expressionToInvalidate, bool $require
 
 	private function shouldInvalidateExpression(string $exprStringToInvalidate, Expr $exprToInvalidate, Expr $expr, bool $requireMoreCharacters = false): bool
 	{
-		if ($requireMoreCharacters && $exprStringToInvalidate === $this->getNodeKey($expr)) {
+		$exprString = $this->getNodeKey($expr);
+		if ($requireMoreCharacters && $exprStringToInvalidate === $exprString) {
 			return false;
 		}
 
 		// Variables will not contain traversable expressions. skip the NodeFinder overhead
 		if ($expr instanceof Variable && is_string($expr->name) && !$requireMoreCharacters) {
-			return $exprStringToInvalidate === $this->getNodeKey($expr);
+			return $exprStringToInvalidate === $exprString;
 		}
 
 		$nodeFinder = new NodeFinder();

Original file line number	Diff line number	Diff line change
`@@ -4112,6 +4112,10 @@ public function exitExpressionAssign(Expr $expr): self`
`4112`	`4112`	`/** @api */`
`4113`	`4113`	`public function isInExpressionAssign(Expr $expr): bool`
`4114`	`4114`	`{`
	`4115`	`+ if (count($this->currentlyAssignedExpressions) === 0) {`
	`4116`	`+ return false;`
	`4117`	`+ }`
	`4118`	`+`
`4115`	`4119`	`$exprString = $this->getNodeKey($expr);`
`4116`	`4120`	`return array_key_exists($exprString, $this->currentlyAssignedExpressions);`
`4117`	`4121`	`}`
`@@ -4185,6 +4189,9 @@ public function unsetAllowedUndefinedExpression(Expr $expr): self`
`4185`	`4189`	`/** @api */`
`4186`	`4190`	`public function isUndefinedExpressionAllowed(Expr $expr): bool`
`4187`	`4191`	`{`
	`4192`	`+ if (count($this->currentlyAllowedUndefinedExpressions) === 0) {`
	`4193`	`+ return false;`
	`4194`	`+ }`
`4188`	`4195`	`$exprString = $this->getNodeKey($expr);`
`4189`	`4196`	`return array_key_exists($exprString, $this->currentlyAllowedUndefinedExpressions);`
`4190`	`4197`	`}`
`@@ -4480,13 +4487,14 @@ public function invalidateExpression(Expr $expressionToInvalidate, bool $require`
`4480`	`4487`
`4481`	`4488`	`private function shouldInvalidateExpression(string $exprStringToInvalidate, Expr $exprToInvalidate, Expr $expr, bool $requireMoreCharacters = false): bool`
`4482`	`4489`	`{`
`4483`		`- if ($requireMoreCharacters && $exprStringToInvalidate === $this->getNodeKey($expr)) {`
	`4490`	`+ $exprString = $this->getNodeKey($expr);`
	`4491`	`+ if ($requireMoreCharacters && $exprStringToInvalidate === $exprString) {`
`4484`	`4492`	`return false;`
`4485`	`4493`	`}`
`4486`	`4494`
`4487`	`4495`	`// Variables will not contain traversable expressions. skip the NodeFinder overhead`
`4488`	`4496`	`if ($expr instanceof Variable && is_string($expr->name) && !$requireMoreCharacters) {`
`4489`		`- return $exprStringToInvalidate === $this->getNodeKey($expr);`
	`4497`	`+ return $exprStringToInvalidate === $exprString;`
`4490`	`4498`	`}`
`4491`	`4499`
`4492`	`4500`	`$nodeFinder = new NodeFinder();`