Merge branch 'master' into 4.x

Author: jrfnl

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

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

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

@@ -24,8 +24,9 @@ class ScopeKeywordSpacingSniff implements Sniff
      */
     public function register()
     {
-        $register   = Tokens::METHOD_MODIFIERS;
-        $register[] = T_READONLY;
+        $register  = Tokens::METHOD_MODIFIERS;
+        $register += Tokens::SCOPE_MODIFIERS;
+        $register[T_READONLY] = T_READONLY;
         return $register;
 
     }//end register()

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:

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

@@ -192,3 +192,13 @@ class FinalProperties {
     final readonly public ?MyType $spacing_correct;
     protected   final   $spacing_incorrect = 'foo';
 }
+
+class AsymVisibility {
+    public(set)      string $asymPublic  = 'hello';
+    public  protected(set)   final  $asymProtected  = 'hello';
+    private(set)     public   string|false $asymPrivate  = 'hello';
+
+    public public(set) $asymPublicPublic  = 'hello';
+    protected(set) public $asymPublicProtected  = 'hello';
+    protected private(set) $asymProtectedPrivate  = 'hello';
+}

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

@@ -185,3 +185,13 @@ class FinalProperties {
     final readonly public ?MyType $spacing_correct;
     protected final $spacing_incorrect = 'foo';
 }
+
+class AsymVisibility {
+    public(set) string $asymPublic  = 'hello';
+    public protected(set) final $asymProtected  = 'hello';
+    private(set) public string|false $asymPrivate  = 'hello';
+
+    public public(set) $asymPublicPublic  = 'hello';
+    protected(set) public $asymPublicProtected  = 'hello';
+    protected private(set) $asymProtectedPrivate  = 'hello';
+}

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

@@ -70,6 +70,9 @@ public function getErrorList($testFile='')
                 187 => 1,
                 188 => 1,
                 193 => 2,
+                197 => 1,
+                198 => 3,
+                199 => 2,
             ];
 
         case 'ScopeKeywordSpacingUnitTest.3.inc':