RequireConstructorPropertyPromotion: Properly autofixing when argument name has an attribute

Author: maryo

SlevomatCodingStandard/Sniffs/Classes/RequireConstructorPropertyPromotionSniff.php

@@ -201,7 +201,11 @@ public function process(File $phpcsFile, $functionPointer): void
 					TokenHelper::findNextNonWhitespace($phpcsFile, $propertyEndPointer + 1),
 				);
 
-				$pointerBeforeParameterStart = TokenHelper::findPrevious($phpcsFile, [T_COMMA, T_OPEN_PARENTHESIS], $parameterPointer - 1);
+				$pointerBeforeParameterStart = TokenHelper::findPrevious(
+					$phpcsFile,
+					[T_COMMA, T_OPEN_PARENTHESIS, T_ATTRIBUTE_END],
+					$parameterPointer - 1,
+				);
 				$parameterStartPointer = TokenHelper::findNextEffective($phpcsFile, $pointerBeforeParameterStart + 1);
 
 				$parameterEqualPointer = TokenHelper::findNextEffective($phpcsFile, $parameterPointer + 1);

tests/Sniffs/Classes/RequireConstructorPropertyPromotionSniffTest.php

@@ -21,7 +21,7 @@ public function testErrors(): void
 			'enable' => true,
 		]);
 
-		self::assertSame(7, $report->getErrorCount());
+		self::assertSame(9, $report->getErrorCount());
 
 		self::assertSniffError(
 			$report,
@@ -65,6 +65,18 @@ public function testErrors(): void
 			RequireConstructorPropertyPromotionSniff::CODE_REQUIRED_CONSTRUCTOR_PROPERTY_PROMOTION,
 			'Required promotion of property $from.',
 		);
+		self::assertSniffError(
+			$report,
+			60,
+			RequireConstructorPropertyPromotionSniff::CODE_REQUIRED_CONSTRUCTOR_PROPERTY_PROMOTION,
+			'Required promotion of property $login.',
+		);
+		self::assertSniffError(
+			$report,
+			61,
+			RequireConstructorPropertyPromotionSniff::CODE_REQUIRED_CONSTRUCTOR_PROPERTY_PROMOTION,
+			'Required promotion of property $password.',
+		);
 
 		self::assertAllFixedInFile($report);
 	}

tests/Sniffs/Classes/data/requireConstructorPropertyPromotionErrors.fixed.php

@@ -28,3 +28,16 @@ public function __construct(bool $active = false, private ?DateTimeImmutable $fr
 	}
 
 }
+
+class Credentials
+{
+
+	public function __construct(
+		#[\SensitiveParameter]
+		private string $login,
+		#[\SensitiveParameter]
+		private string $password
+	) {
+	}
+
+}

tests/Sniffs/Classes/data/requireConstructorPropertyPromotionErrors.php

@@ -53,3 +53,21 @@ public function __construct(bool $active = false, ?DateTimeImmutable $from = nul
 	}
 
 }
+
+class Credentials
+{
+
+	private string $login;
+	private string $password;
+
+	public function __construct(
+		#[\SensitiveParameter]
+		string $login,
+		#[\SensitiveParameter]
+		string $password
+	) {
+		$this->login = $login;
+		$this->password = $password;
+	}
+
+}