Merge pull request PHPCSStandards#1123 from PHPCSStandards/php-8.4/feature/squiz-membervarspacing-support-asym-visibility

Squiz/MemberVarSpacing: update for properties with asymmetric visibility

Author: jrfnl

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

@@ -53,7 +53,9 @@ protected function processMemberVar(File $phpcsFile, $stackPtr)
 
         $endOfPreviousStatement = $phpcsFile->findPrevious($stopPoints, ($stackPtr - 1), null, false, null, true);
 
-        $validPrefixes   = Tokens::$methodPrefixes;
+        $validPrefixes   = Tokens::$scopeModifiers;
+        $validPrefixes[] = T_STATIC;
+        $validPrefixes[] = T_FINAL;
         $validPrefixes[] = T_VAR;
         $validPrefixes[] = T_READONLY;
 

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

@@ -444,3 +444,18 @@ class MultilineCommentShouldNotBeSplitUp {
      */
     public $prop;
 }
+
+class AsymVisibility {
+    protected private(set) int $asymProtectedPrivate;
+
+    /**
+     * Docblock
+     */
+    protected(set) final string $asymProtected;
+    #[AnAttribute]
+
+    public(set) string|bool $asymPublic;
+
+
+    private(set) private bool $asymPrivate;
+}

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

@@ -431,3 +431,18 @@ class MultilineCommentShouldNotBeSplitUp {
      */
     public $prop;
 }
+
+class AsymVisibility {
+
+    protected private(set) int $asymProtectedPrivate;
+
+    /**
+     * Docblock
+     */
+    protected(set) final string $asymProtected;
+
+    #[AnAttribute]
+    public(set) string|bool $asymPublic;
+
+    private(set) private bool $asymPrivate;
+}

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

@@ -87,6 +87,10 @@ public function getErrorList($testFile='')
                 427 => 1,
                 437 => 1,
                 445 => 1,
+                449 => 1,
+                456 => 1,
+                457 => 1,
+                460 => 1,
             ];
 
         default: