Merge branch 'master' into 4.x

Author: jrfnl

src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php

@@ -62,6 +62,7 @@ protected function processMemberVar(File $phpcsFile, $stackPtr)
         $find[] = T_VAR;
         $find[] = T_READONLY;
         $find[] = T_FINAL;
+        $find[] = T_ABSTRACT;
         $find[] = T_SEMICOLON;
         $find[] = T_OPEN_CURLY_BRACKET;
 
@@ -203,6 +204,31 @@ protected function processMemberVar(File $phpcsFile, $stackPtr)
             }
         }//end if
 
+        if ($hasVisibilityModifier === true && $propertyInfo['is_abstract'] === true) {
+            $scopePtr    = $firstVisibilityModifier;
+            $abstractPtr = $phpcsFile->findPrevious(T_ABSTRACT, ($stackPtr - 1));
+            if ($abstractPtr > $scopePtr) {
+                $error = 'The abstract declaration must come before the visibility declaration';
+                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'AbstractAfterVisibility');
+                if ($fix === true) {
+                    $phpcsFile->fixer->beginChangeset();
+
+                    for ($i = ($abstractPtr + 1); $abstractPtr < $stackPtr; $i++) {
+                        if ($tokens[$i]['code'] !== T_WHITESPACE) {
+                            break;
+                        }
+
+                        $phpcsFile->fixer->replaceToken($i, '');
+                    }
+
+                    $phpcsFile->fixer->replaceToken($abstractPtr, '');
+                    $phpcsFile->fixer->addContentBefore($scopePtr, $tokens[$abstractPtr]['content'].' ');
+
+                    $phpcsFile->fixer->endChangeset();
+                }
+            }
+        }//end if
+
         if ($hasVisibilityModifier === true && $propertyInfo['is_static'] === true) {
             $scopePtr  = $lastVisibilityModifier;
             $staticPtr = $phpcsFile->findPrevious(T_STATIC, ($stackPtr - 1));

src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.1.inc

@@ -131,3 +131,11 @@ class AsymmetricVisibility {
     final static protected(set) bool $wrongOrder12;
     static public(set) final bool $wrongOrder13;
 }
+
+abstract class AbstractProperties {
+    abstract public int $foo { get; }
+    abstract protected (D|N)|false  $foo { set; }
+    abstract array $foo { get; }
+    public ABSTRACT ?int $wrongOrder1 { set; }
+    protected abstract ?string $wrongOrder2 { get; }
+}

src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.1.inc.fixed

@@ -128,3 +128,11 @@ class AsymmetricVisibility {
     final protected(set) static bool $wrongOrder12;
     final public(set) static bool $wrongOrder13;
 }
+
+abstract class AbstractProperties {
+    abstract public int $foo { get; }
+    abstract protected (D|N)|false $foo { set; }
+    abstract array $foo { get; }
+    ABSTRACT public ?int $wrongOrder1 { set; }
+    abstract protected ?string $wrongOrder2 { get; }
+}

src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php

@@ -80,6 +80,10 @@ public function getErrorList($testFile='')
                 130 => 1,
                 131 => 1,
                 132 => 2,
+                137 => 1,
+                138 => 1,
+                139 => 1,
+                140 => 1,
             ];
 
         default: