PropertyHelper can detect promoted properties

Author: kukulich

SlevomatCodingStandard/Helpers/PropertyHelper.php

@@ -33,19 +33,28 @@
 class PropertyHelper
 {
 
-	public static function isProperty(File $phpcsFile, int $variablePointer): bool
+	public static function isProperty(File $phpcsFile, int $variablePointer, bool $promoted = false): bool
 	{
 		$tokens = $phpcsFile->getTokens();
 
-		$previousPointer = TokenHelper::findPreviousEffective($phpcsFile, $variablePointer - 1);
+		$previousPointer = TokenHelper::findPreviousExcluding(
+			$phpcsFile,
+			array_merge(TokenHelper::$ineffectiveTokenCodes, TokenHelper::getTypeHintTokenCodes(), [T_NULLABLE]),
+			$variablePointer - 1
+		);
 
 		if ($tokens[$previousPointer]['code'] === T_STATIC) {
 			$previousPointer = TokenHelper::findPreviousEffective($phpcsFile, $previousPointer - 1);
 		}
 
 		if (in_array($tokens[$previousPointer]['code'], [T_PUBLIC, T_PROTECTED, T_PRIVATE, T_VAR, T_READONLY], true)) {
 			$constructorPointer = TokenHelper::findPrevious($phpcsFile, T_FUNCTION, $previousPointer - 1);
-			return $constructorPointer === null || $tokens[$constructorPointer]['parenthesis_closer'] < $previousPointer;
+
+			if ($constructorPointer === null) {
+				return true;
+			}
+
+			return $tokens[$constructorPointer]['parenthesis_closer'] < $previousPointer || $promoted;
 		}
 
 		if (

tests/Helpers/PropertyHelperTest.php

@@ -34,6 +34,10 @@ public function dataIsProperty(): array
 				'$boo',
 				false,
 			],
+			[
+				'$propertyPromotionWithTypeHint',
+				false,
+			],
 			[
 				'$hoo',
 				false,
@@ -104,6 +108,28 @@ public function testIsProperty(string $variableName, bool $isProperty): void
 		self::assertSame($isProperty, PropertyHelper::isProperty($phpcsFile, $variablePointer));
 	}
 
+	/**
+	 * @return mixed[][]
+	 */
+	public function dataIsPropertyIfPromoted(): array
+	{
+		return [
+			['$propertyPromotion'],
+			['$propertyPromotionWithTypeHint'],
+		];
+	}
+
+	/**
+	 * @dataProvider dataIsPropertyIfPromoted
+	 */
+	public function testIsPropertyIfPromoted(string $variableName): void
+	{
+		$phpcsFile = $this->getTestedCodeSnifferFile();
+
+		$variablePointer = TokenHelper::findNextContent($phpcsFile, T_VARIABLE, $variableName, 0);
+		self::assertTrue(PropertyHelper::isProperty($phpcsFile, $variablePointer, true));
+	}
+
 	/**
 	 * @return mixed[][]
 	 */

tests/Helpers/data/propertyOrNot.php

@@ -10,7 +10,7 @@ class Foo
 
 	private static $string = 'string';
 
-	public function __construct(private $propertyPromotion, $boo)
+	public function __construct(private $propertyPromotion, $boo, public readonly Foo|Bar $propertyPromotionWithTypeHint)
 	{
 		$hoo = $boo;
 	}