Merge pull request #252 from PHPCSStandards/feature/objectdeclaration…

…s-getclassproperties-allow-for-final ObjectDeclarations::getClassProperties(): allow for `abstract final`
PHPCSStandards · May 13, 2021 · 7a4fab4 · 7a4fab4
2 parents af11185 + 513a078
commit 7a4fab4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/PHPCSUtils/Utils/ObjectDeclarations.php b/PHPCSUtils/Utils/ObjectDeclarations.php
@@ -157,7 +157,6 @@ public static function getName(File $phpcsFile, $stackPtr)
      * - Bugs fixed:
      *   - Handling of PHPCS annotations.
      *   - Handling of unorthodox docblock placement.
-     *   - A class cannot both be abstract as well as final, so this utility should not allow for that.
      * - Defensive coding against incorrect calls to this method.
      *
      * @see \PHP_CodeSniffer\Files\File::getClassProperties()   Original source.
@@ -203,11 +202,11 @@ public static function getClassProperties(File $phpcsFile, $stackPtr)
             switch ($tokens[$i]['code']) {
                 case \T_ABSTRACT:
                     $properties['is_abstract'] = true;
-                    break 2;
+                    break;
 
                 case \T_FINAL:
                     $properties['is_final'] = true;
-                    break 2;
+                    break;
             }
         }
 

diff --git a/Tests/BackCompat/BCFile/GetClassPropertiesTest.inc b/Tests/BackCompat/BCFile/GetClassPropertiesTest.inc
@@ -29,3 +29,10 @@ abstract
  * @phpcs:disable Standard.Cat.SniffName -- Just because.
  */
 class ClassWithDocblock {}
+
+/* testParseErrorAbstractFinal */
+final /* comment */
+
+    abstract // Intentional parse error, class cannot both be final and abstract.
+
+        class AbstractFinal {}
diff --git a/Tests/BackCompat/BCFile/GetClassPropertiesTest.php b/Tests/BackCompat/BCFile/GetClassPropertiesTest.php
@@ -138,6 +138,13 @@ public function dataGetClassProperties()
                     'is_final'    => false,
                 ],
             ],
+            'abstract-final-parse-error' => [
+                '/* testParseErrorAbstractFinal */',
+                [
+                    'is_abstract' => true,
+                    'is_final'    => true,
+                ],
+            ],
         ];
     }
 }
diff --git a/Tests/Utils/ObjectDeclarations/GetClassPropertiesDiffTest.inc b/Tests/Utils/ObjectDeclarations/GetClassPropertiesDiffTest.inc
@@ -16,10 +16,3 @@ final
  * @phpcs:disable Standard.Cat.SniffName -- Just because.
  */
 class ClassWithPropertyBeforeDocblock {}
-
-/* testParseErrorAbstractFinal */
-final /* comment */
-
-    abstract // Intentional parse error, class cannot both be final and abstract.
-
-        class AbstractFinal {}
diff --git a/Tests/Utils/ObjectDeclarations/GetClassPropertiesDiffTest.php b/Tests/Utils/ObjectDeclarations/GetClassPropertiesDiffTest.php
@@ -81,13 +81,6 @@ public function dataGetClassProperties()
                     'is_final'    => true,
                 ],
             ],
-            'abstract-final-parse-error' => [
-                '/* testParseErrorAbstractFinal */',
-                [
-                    'is_abstract' => true,
-                    'is_final'    => false,
-                ],
-            ],
         ];
     }
 }