PHP 8.0 | Squiz.WhiteSpace.MemberVarSpacing: fix support for attributes

Author: javer

src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php

@@ -67,7 +67,8 @@ protected function processMemberVar(File $phpcsFile, $stackPtr)
             if ($tokens[$prev]['code'] === T_ATTRIBUTE_END
                 && isset($tokens[$prev]['attribute_opener']) === true
             ) {
-                $prev = $tokens[$prev]['attribute_opener'];
+                $prev  = $tokens[$prev]['attribute_opener'];
+                $start = $prev;
                 continue;
             }
 
@@ -140,7 +141,7 @@ protected function processMemberVar(File $phpcsFile, $stackPtr)
             $first = $tokens[$start]['comment_opener'];
         } else {
             $first = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($start - 1), null, true);
-            $first = $phpcsFile->findNext(Tokens::$commentTokens, ($first + 1));
+            $first = $phpcsFile->findNext(array_merge(Tokens::$commentTokens, [T_ATTRIBUTE]), ($first + 1));
         }
 
         // Determine if this is the first member var.

src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.inc

@@ -355,4 +355,13 @@ class HasAttributes
 
     #[ORM\Column(ORM\Column::T_INTEGER)]
     protected $height;
+
+    #[SingleAttribute]
+    protected $propertySingle;
+
+    #[FirstAttribute]
+    #[SecondAttribute]
+    protected $propertyDouble;
+    #[ThirdAttribute]
+    protected $propertyWithoutSpacing;
 }

src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.inc.fixed

@@ -339,4 +339,14 @@ class HasAttributes
     #[ORM\GeneratedValue]
     #[ORM\Column(ORM\Column::T_INTEGER)]
     protected $height;
+
+    #[SingleAttribute]
+    protected $propertySingle;
+
+    #[FirstAttribute]
+    #[SecondAttribute]
+    protected $propertyDouble;
+
+    #[ThirdAttribute]
+    protected $propertyWithoutSpacing;
 }

src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php

@@ -61,6 +61,7 @@ public function getErrorList()
             346 => 1,
             353 => 1,
             357 => 1,
+            366 => 1,
         ];
 
     }//end getErrorList()