Merge branch refs/heads/1.12.x into 2.0.x

phpstan · Dec 17, 2024 · 5f12df7 · 5f12df7
2 parents d3cf77b + 9c81a80
commit 5f12df7
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -711,15 +711,16 @@ private function getNodeKey(Expr $node): string
 	{
 		$key = $this->exprPrinter->printExpr($node);
 
+		$attributes = $node->getAttributes();
 		if (
 			$node instanceof Node\FunctionLike
-			&& $node->hasAttribute(ArrayMapArgVisitor::ATTRIBUTE_NAME)
-			&& $node->hasAttribute('startFilePos')
+			&& (($attributes[ArrayMapArgVisitor::ATTRIBUTE_NAME] ?? null) !== null)
+			&& (($attributes['startFilePos'] ?? null) !== null)
 		) {
-			$key .= '/*' . $node->getAttribute('startFilePos') . '*/';
+			$key .= '/*' . $attributes['startFilePos'] . '*/';
 		}
 
-		if ($node->getAttribute(self::KEEP_VOID_ATTRIBUTE_NAME) === true) {
+		if (($attributes[self::KEEP_VOID_ATTRIBUTE_NAME] ?? null) === true) {
 			$key .= '/*' . self::KEEP_VOID_ATTRIBUTE_NAME . '*/';
 		}