SlevomatCodingStandard.Classes.RequireConstructorPropertyPromotion: Fixes using prefixed var phpdoc

Author: franmomu

SlevomatCodingStandard/Sniffs/Classes/RequireConstructorPropertyPromotionSniff.php

@@ -320,7 +320,7 @@ private function isPropertyDocCommentUseful(File $phpcsFile, int $propertyPointe
 		}
 
 		foreach (AnnotationHelper::getAnnotations($phpcsFile, $propertyPointer) as $annotationType => $annotations) {
-			if ($annotationType !== '@var') {
+			if (!in_array($annotationType, ['@var', '@phpstan-var', '@psalm-var'], true)) {
 				return true;
 			}
 

tests/Sniffs/Classes/RequireConstructorPropertyPromotionSniffTest.php

@@ -21,7 +21,7 @@ public function testErrors(): void
 			'enable' => true,
 		]);
 
-		self::assertSame(6, $report->getErrorCount());
+		self::assertSame(7, $report->getErrorCount());
 
 		self::assertSniffError(
 			$report,
@@ -55,7 +55,13 @@ public function testErrors(): void
 		);
 		self::assertSniffError(
 			$report,
-			39,
+			23,
+			RequireConstructorPropertyPromotionSniff::CODE_REQUIRED_CONSTRUCTOR_PROPERTY_PROMOTION,
+			'Required promotion of property $g.'
+		);
+		self::assertSniffError(
+			$report,
+			44,
 			RequireConstructorPropertyPromotionSniff::CODE_REQUIRED_CONSTRUCTOR_PROPERTY_PROMOTION,
 			'Required promotion of property $from.'
 		);

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

@@ -6,7 +6,8 @@ class Whatever
 	#[SomeAttribute]
 	private $d;
 
-	public function __construct(public string $a, protected int|null $b = 0, private ?bool $c = null, $d, private $e, private readonly string $f)
+    /** @phpstan-param array<int, string> $g */
+	public function __construct(public string $a, protected int|null $b = 0, private ?bool $c = null, $d, private $e, private readonly string $f, private array $g)
 	{
 		$this->d = $d;
 	}

tests/Sniffs/Classes/data/requireConstructorPropertyPromotionErrors.php

@@ -19,14 +19,19 @@ class Whatever
 
 	private readonly string $f;
 
-	public function __construct(string $a, int|null $b = 0, ?bool $c, $d, $e, string $f)
+    /** @phpstan-var array<int, string> */
+	private array $g;
+
+    /** @phpstan-param array<int, string> $g */
+	public function __construct(string $a, int|null $b = 0, ?bool $c, $d, $e, string $f, array $g)
 	{
 		$this->a = $a;
 		$this->b = $b;
 		$this->c = $c;
 		$this->d = $d;
 		$this->e = $e;
 		$this->f = $f;
+		$this->g = $g;
 	}
 
 }