Added support for ConstantString unions in NodeConnectingVisitorAttributesRule

Author: zonuexe

src/Rules/Api/NodeConnectingVisitorAttributesRule.php

@@ -9,7 +9,6 @@
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\ObjectType;
 use function array_keys;
-use function count;
 use function in_array;
 use function sprintf;
 use function str_starts_with;
@@ -41,38 +40,40 @@ public function processNode(Node $node, Scope $scope): array
 		if (!isset($args[0])) {
 			return [];
 		}
+
+		$messages = [];
 		$argType = $scope->getType($args[0]->value);
-		if (count($argType->getConstantStrings()) !== 1) {
-			return [];
-		}
-		$argValue = $argType->getConstantScalarValues()[0];
-		if (!in_array($argValue, ['parent', 'previous', 'next'], true)) {
-			return [];
-		}
-		if (!$scope->isInClass()) {
-			return [];
-		}
+		foreach ($argType->getConstantStrings() as $constantString) {
+			$argValue = $constantString->getValue();
+			if (!in_array($argValue, ['parent', 'previous', 'next'], true)) {
+				continue;
+			}
 
-		$classReflection = $scope->getClassReflection();
-		$hasPhpStanInterface = false;
-		foreach (array_keys($classReflection->getInterfaces()) as $interfaceName) {
-			if (!str_starts_with($interfaceName, 'PHPStan\\')) {
+			if (!$scope->isInClass()) {
 				continue;
 			}
 
-			$hasPhpStanInterface = true;
-		}
+			$classReflection = $scope->getClassReflection();
+			$hasPhpStanInterface = false;
+			foreach (array_keys($classReflection->getInterfaces()) as $interfaceName) {
+				if (!str_starts_with($interfaceName, 'PHPStan\\')) {
+					continue;
+				}
 
-		if (!$hasPhpStanInterface) {
-			return [];
-		}
+				$hasPhpStanInterface = true;
+			}
 
-		return [
-			RuleErrorBuilder::message(sprintf('Node attribute \'%s\' is no longer available.', $argValue))
+			if (!$hasPhpStanInterface) {
+				continue;
+			}
+
+			$messages[] = RuleErrorBuilder::message(sprintf('Node attribute \'%s\' is no longer available.', $argValue))
 				->identifier('phpParser.nodeConnectingAttribute')
 				->tip('See: https://phpstan.org/blog/preprocessing-ast-for-custom-rules')
-				->build(),
-		];
+				->build();
+		}
+
+		return $messages;
 	}
 
 }

tests/PHPStan/Rules/Api/NodeConnectingVisitorAttributesRuleTest.php

@@ -21,7 +21,12 @@ public function testRule(): void
 		$this->analyse([__DIR__ . '/data/node-connecting-visitor.php'], [
 			[
 				'Node attribute \'parent\' is no longer available.',
-				18,
+				22,
+				'See: https://phpstan.org/blog/preprocessing-ast-for-custom-rules',
+			],
+			[
+				'Node attribute \'parent\' is no longer available.',
+				24,
 				'See: https://phpstan.org/blog/preprocessing-ast-for-custom-rules',
 			],
 		]);

tests/PHPStan/Rules/Api/data/node-connecting-visitor.php

@@ -8,6 +8,10 @@
 
 class MyRule implements Rule
 {
+
+	/** @var 'parent'|'myCustomAttribute' */
+	public string $attrName;
+
 	public function getNodeType(): string
 	{
 		return Node::class;
@@ -17,6 +21,7 @@ public function processNode(Node $node, Scope $scope): array
 	{
 		$parent = $node->getAttribute("parent");
 		$custom = $node->getAttribute("myCustomAttribute");
+		$parent = $node->getAttribute($this->attrName);
 
 		return [];
 	}