PHP 8.0 | Variables::getMemberProperties(): correctly handle attributes

Sync with upstream PR 3203 which ensures that attributes for properties are correctly regarded as "stop points" for gathering property information. Ref: * squizlabs/PHP_CodeSniffer 3203 Co-authored-by: Alessandro Chitolina <alekitto@gmail.com>

Author: jrfnl

PHPCSUtils/Utils/Variables.php

@@ -88,6 +88,7 @@ class Variables
  *
  * @since 1.0.0
  * @since 1.0.0-alpha4 Added support for PHP 8.0 union types.
+ * @since 1.0.0-alpha4 No longer gets confused by PHP 8.0 property attributes.
  *
  * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
  * @param int $stackPtr The position in the stack of the `T_VARIABLE` token
@@ -138,6 +139,7 @@ public static function getMemberProperties(File $phpcsFile, $stackPtr)
  \T_SEMICOLON,
  \T_OPEN_CURLY_BRACKET,
  \T_CLOSE_CURLY_BRACKET,
+ \T_ATTRIBUTE_END,
  ],
  ($stackPtr - 1)
  );

Tests/BackCompat/BCFile/GetMemberPropertiesTest.inc

@@ -243,3 +243,19 @@ $anon = class() {
  // Intentional fatal error - duplicate types are not allowed in union types, but that's not the concern of the method.
  public int |string| /*comment*/ INT $duplicateTypeInUnion;
 };
+
+$anon = class {
+ /* testPHP8PropertySingleAttribute */
+ #[PropertyWithAttribute]
+ public string $foo;
+
+ /* testPHP8PropertyMultipleAttributes */
+ #[PropertyWithAttribute(foo: 'bar'), MyAttribute]
+ protected ?int|float $bar;
+
+ /* testPHP8PropertyMultilineAttribute */
+ #[
+ PropertyWithAttribute(/* comment */ 'baz')
+ ]
+ private mixed $baz;
+};

Tests/BackCompat/BCFile/GetMemberPropertiesTest.php

@@ -764,6 +764,42 @@ public function dataGetMemberProperties()
  'nullable_type' => false,
  ],
  ],
+ 'php8-property-with-single-attribute' => [
+ '/* testPHP8PropertySingleAttribute */',
+ [
+ 'scope' => 'public',
+ 'scope_specified' => true,
+ 'is_static' => false,
+ 'type' => 'string',
+ 'type_token' => -2, // Offset from the T_VARIABLE token.
+ 'type_end_token' => -2, // Offset from the T_VARIABLE token.
+ 'nullable_type' => false,
+ ],
+ ],
+ 'php8-property-with-multiple-attributes' => [
+ '/* testPHP8PropertyMultipleAttributes */',
+ [
+ 'scope' => 'protected',
+ 'scope_specified' => true,
+ 'is_static' => false,
+ 'type' => '?int|float',
+ 'type_token' => -4, // Offset from the T_VARIABLE token.
+ 'type_end_token' => -2, // Offset from the T_VARIABLE token.
+ 'nullable_type' => true,
+ ],
+ ],
+ 'php8-property-with-multiline-attribute' => [
+ '/* testPHP8PropertyMultilineAttribute */',
+ [
+ 'scope' => 'private',
+ 'scope_specified' => true,
+ 'is_static' => false,
+ 'type' => 'mixed',
+ 'type_token' => -2, // Offset from the T_VARIABLE token.
+ 'type_end_token' => -2, // Offset from the T_VARIABLE token.
+ 'nullable_type' => false,
+ ],
+ ],
  ];
  }