Attributes should be processed by FQN

kukulich · kukulich · commit 387cd37bd80d · 2025-07-05T15:42:54.000+02:00
diff --git a/SlevomatCodingStandard/Helpers/Attribute.php b/SlevomatCodingStandard/Helpers/Attribute.php
@@ -12,16 +12,26 @@ class Attribute
 
 	private string $name;
 
+	private string $fullyQualifiedName;
+
 	private int $startPointer;
 
 	private int $endPointer;
 
 	private ?string $content = null;
 
-	public function __construct(int $attributePointer, string $name, int $startPointer, int $endPointer, ?string $content = null)
+	public function __construct(
+		int $attributePointer,
+		string $name,
+		string $fullyQualifiedName,
+		int $startPointer,
+		int $endPointer,
+		?string $content = null
+	)
 	{
 		$this->attributePointer = $attributePointer;
 		$this->name = $name;
+		$this->fullyQualifiedName = $fullyQualifiedName;
 		$this->startPointer = $startPointer;
 		$this->endPointer = $endPointer;
 		$this->content = $content;
@@ -37,6 +47,11 @@ public function getName(): string
 		return $this->name;
 	}
 
+	public function getFullyQualifiedName(): string
+	{
+		return $this->fullyQualifiedName;
+	}
+
 	public function getStartPointer(): int
 	{
 		return $this->startPointer;
diff --git a/SlevomatCodingStandard/Helpers/AttributeHelper.php b/SlevomatCodingStandard/Helpers/AttributeHelper.php
@@ -78,6 +78,7 @@ public static function getAttributes(File $phpcsFile, int $attributeOpenerPointe
 				$attributes[] = new Attribute(
 					$attributeOpenerPointer,
 					$attributeName,
+					NamespaceHelper::resolveClassName($phpcsFile, $attributeName, $attributeOpenerPointer),
 					$attributeNameStartPointer,
 					$attributeNameEndPointer,
 				);
@@ -88,6 +89,7 @@ public static function getAttributes(File $phpcsFile, int $attributeOpenerPointe
 				$attributes[] = new Attribute(
 					$attributeOpenerPointer,
 					$attributeName,
+					NamespaceHelper::resolveClassName($phpcsFile, $attributeName, $attributeOpenerPointer),
 					$attributeNameStartPointer,
 					$attributeNameEndPointer,
 				);
@@ -99,6 +101,7 @@ public static function getAttributes(File $phpcsFile, int $attributeOpenerPointe
 				$attributes[] = new Attribute(
 					$attributeOpenerPointer,
 					$attributeName,
+					NamespaceHelper::resolveClassName($phpcsFile, $attributeName, $attributeOpenerPointer),
 					$attributeNameStartPointer,
 					$tokens[$pointerAfterAttributeName]['parenthesis_closer'],
 					TokenHelper::getContent(
diff --git a/SlevomatCodingStandard/Sniffs/Attributes/AttributesOrderSniff.php b/SlevomatCodingStandard/Sniffs/Attributes/AttributesOrderSniff.php
@@ -92,16 +92,16 @@ public function process(File $phpcsFile, $attributeOpenerPointer): void
 			uasort(
 				$expectedOrder,
 				static fn (array $attributesGroup1, array $attributesGroup2): int => strnatcmp(
-					$attributesGroup1[0]->getName(),
-					$attributesGroup2[0]->getName(),
+					$attributesGroup1[0]->getFullyQualifiedName(),
+					$attributesGroup2[0]->getFullyQualifiedName(),
 				),
 			);
 
 		} else {
 			$actualOrder = [];
 
 			foreach ($attributesGroups as $attributesGroupNo => $attributesGroup) {
-				$attributeName = $this->normalizeAttributeName($attributesGroup[0]->getName());
+				$attributeName = $this->normalizeAttributeName($attributesGroup[0]->getFullyQualifiedName());
 
 				foreach ($this->order as $orderPosition => $attributeNameOnPosition) {
 					if (
diff --git a/SlevomatCodingStandard/Sniffs/TypeHints/DisallowMixedTypeHintSniff.php b/SlevomatCodingStandard/Sniffs/TypeHints/DisallowMixedTypeHintSniff.php
@@ -88,11 +88,11 @@ private function targetHasOverrideAttribute(File $phpcsFile, int $docCommentOpen
 		}
 
 		$attributeNames = array_map(
-			static fn (Attribute $name): string => $name->getName(),
+			static fn (Attribute $name): string => $name->getFullyQualifiedName(),
 			AttributeHelper::getAttributes($phpcsFile, $nextPointer),
 		);
 
-		return in_array('Override', $attributeNames, true) || in_array('\Override', $attributeNames, true);
+		return in_array('\Override', $attributeNames, true);
 	}
 
 }
diff --git a/tests/Helpers/AttributeHelperTest.php b/tests/Helpers/AttributeHelperTest.php
@@ -18,20 +18,21 @@ public function testGetAttributesInsideAttributeTags(): void
 		$attributes = AttributeHelper::getAttributes($phpcsFile, $firstAttributePointer);
 
 		$expected = [
-			4 => ['Attribute1', null],
-			7 => ['\\FQN\\Attribute2', "('var')"],
-			17 => ['Attribute3', "(option: PDO::class, option2: true, option3: 'False')"],
-			39 => ['\\Attribute4', '()'],
-			44 => ['Attribute5', null],
+			['Attribute1', '\\Attribute1', null],
+			['\\FQN\\Attribute2', '\\FQN\\Attribute2', "('var')"],
+			['Attribute3', '\\Attribute3', "(option: PDO::class, option2: true, option3: 'False')"],
+			['\\Attribute4', '\\Attribute4', '()'],
+			['Attribute5', '\\Attribute5', null],
+			['Attribute6', '\\FQN\\Attribute6', null],
 		];
 
 		self::assertCount(count($expected), $attributes);
 
-		foreach ($attributes as $attribute) {
-			self::assertSame(3, $attribute->getAttributePointer());
-			self::assertArrayHasKey($attribute->getStartPointer(), $expected);
-			self::assertSame($expected[$attribute->getStartPointer()][0], $attribute->getName());
-			self::assertSame($expected[$attribute->getStartPointer()][1], $attribute->getContent());
+		foreach ($attributes as $attributeNo => $attribute) {
+			self::assertSame(11, $attribute->getAttributePointer());
+			self::assertSame($expected[$attributeNo][0], $attribute->getName());
+			self::assertSame($expected[$attributeNo][1], $attribute->getFullyQualifiedName());
+			self::assertSame($expected[$attributeNo][2], $attribute->getContent());
 		}
 	}
 
diff --git a/tests/Helpers/data/classWithJoinedAttributes.php b/tests/Helpers/data/classWithJoinedAttributes.php
@@ -1,7 +1,9 @@
 <?php // lint >= 8.0
 
+use FQN\Attribute6;
+
 #[Attribute1, \FQN\Attribute2('var'),
-	Attribute3(option: PDO::class, option2: true, option3: 'False'),\Attribute4(),Attribute5]
+	Attribute3(option: PDO::class, option2: true, option3: 'False'),\Attribute4(),Attribute5,Attribute6]
 class FooClass
 {
 }
diff --git a/tests/Sniffs/Attributes/AttributesOrderSniffTest.php b/tests/Sniffs/Attributes/AttributesOrderSniffTest.php
@@ -40,9 +40,9 @@ public function testErrors(): void
 
 		self::assertSame(3, $report->getErrorCount());
 
-		self::assertSniffError($report, 3, AttributesOrderSniff::CODE_INCORRECT_ORDER);
-		self::assertSniffError($report, 14, AttributesOrderSniff::CODE_INCORRECT_ORDER);
-		self::assertSniffError($report, 19, AttributesOrderSniff::CODE_INCORRECT_ORDER);
+		self::assertSniffError($report, 5, AttributesOrderSniff::CODE_INCORRECT_ORDER);
+		self::assertSniffError($report, 16, AttributesOrderSniff::CODE_INCORRECT_ORDER);
+		self::assertSniffError($report, 21, AttributesOrderSniff::CODE_INCORRECT_ORDER);
 
 		self::assertAllFixedInFile($report);
 	}
diff --git a/tests/Sniffs/Attributes/data/attributesOrderErrors.fixed.php b/tests/Sniffs/Attributes/data/attributesOrderErrors.fixed.php
@@ -1,5 +1,7 @@
 <?php
 
+use Group\Unknown;
+
 #[Attribute1]
 #[Attribute2]
 #[\Group\Attribute1]
@@ -20,6 +22,7 @@ public function method()
 	#[Attribute2]
 	#[\Group\Attribute1]
 	#[\Group\Attribute2]
+	#[Unknown]
 	#[\Group\Unknown]
 	#[AppAssertB\SomeAssert]
 	#[AppAssertA\SomeAssert]
diff --git a/tests/Sniffs/Attributes/data/attributesOrderErrors.php b/tests/Sniffs/Attributes/data/attributesOrderErrors.php
@@ -1,5 +1,7 @@
 <?php
 
+use Group\Unknown;
+
 #[UnknownOrder]
 #[\Group\Unknown]
 #[\Group\Attribute2]
@@ -16,6 +18,7 @@ public function method()
 	{
 	}
 
+	#[Unknown]
 	#[UnknownOrder] #[\Group\Unknown] #[AppAssertB\SomeAssert]
 	#[\Group\Attribute2] #[Attribute2] #[\Group\Attribute1]
 	#[Attribute1] #[AppAssertA\SomeAssert]
diff --git a/tests/Sniffs/Attributes/data/attributesOrderNoErrors.php b/tests/Sniffs/Attributes/data/attributesOrderNoErrors.php
@@ -1,5 +1,7 @@
 <?php
 
+use Group\Unknown;
+
 #[Attribute1]
 #[Attribute2]
 #[\Group\Attribute1]
@@ -12,7 +14,7 @@ class Whatever
 {
 
 	#[Attribute1] #[Attribute2]
-	#[\Group\Attribute1] #[\Group\Attribute2] #[\Group\Unknown]
+	#[\Group\Attribute1] #[\Group\Attribute2] #[\Group\Unknown] #[Unknown]
 	#[AppAssertA\SomeAssert] #[AppAssertB\SomeAssert]
 	#[UnknownOrder]
 	public function method()

Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,11 @@ private function targetHasOverrideAttribute(File $phpcsFile, int $docCommentOpen`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`$attributeNames = array_map(`
`91`		`- static fn (Attribute $name): string => $name->getName(),`
	`91`	`+ static fn (Attribute $name): string => $name->getFullyQualifiedName(),`
`92`	`92`	`AttributeHelper::getAttributes($phpcsFile, $nextPointer),`
`93`	`93`	`);`
`94`	`94`
`95`		`- return in_array('Override', $attributeNames, true) \|\| in_array('\Override', $attributeNames, true);`
	`95`	`+ return in_array('\Override', $attributeNames, true);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`<?php // lint >= 8.0`
`2`	`2`
	`3`	`+use FQN\Attribute6;`
	`4`	`+`
`3`	`5`	`#[Attribute1, \FQN\Attribute2('var'),`
`4`		`- Attribute3(option: PDO::class, option2: true, option3: 'False'),\Attribute4(),Attribute5]`
	`6`	`+ Attribute3(option: PDO::class, option2: true, option3: 'False'),\Attribute4(),Attribute5,Attribute6]`
`5`	`7`	`class FooClass`
`6`	`8`	`{`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+use Group\Unknown;`
	`4`	`+`
`3`	`5`	`#[UnknownOrder]`
`4`	`6`	`#[\Group\Unknown]`
`5`	`7`	`#[\Group\Attribute2]`
`@@ -16,6 +18,7 @@ public function method()`
`16`	`18`	`{`
`17`	`19`	`}`
`18`	`20`
	`21`	`+ #[Unknown]`
`19`	`22`	`#[UnknownOrder] #[\Group\Unknown] #[AppAssertB\SomeAssert]`
`20`	`23`	`#[\Group\Attribute2] #[Attribute2] #[\Group\Attribute1]`
`21`	`24`	`#[Attribute1] #[AppAssertA\SomeAssert]`