feat: make format compatible with "PER Coding Style 2.0" (#2269)

* feat: make format compatible with phpcsfixer * feat: add missing tests * feat: add missing test case * feat: move readonly modifier after abstract
prettier · Dec 16, 2023 · e3f8cba · e3f8cba
1 parent 69a68d8
commit e3f8cba
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/src/printer.mjs b/src/printer.mjs
@@ -1204,10 +1204,6 @@ function printClass(path, options, print) {
   const attrs = printAttrs(path, options, print, { inline: isAnonymousClass });
   const declaration = isAnonymousClass ? [] : [...attrs];
 
-  if (node.isReadonly) {
-    declaration.push("readonly ");
-  }
-
   if (node.isFinal) {
     declaration.push("final ");
   }
@@ -1216,6 +1212,10 @@ function printClass(path, options, print) {
     declaration.push("abstract ");
   }
 
+  if (node.isReadonly) {
+    declaration.push("readonly ");
+  }
+
   // `new` print `class` keyword with arguments
   declaration.push(isAnonymousClass ? "" : node.kind);
 

diff --git a/tests/class/__snapshots__/jsfmt.spec.mjs.snap b/tests/class/__snapshots__/jsfmt.spec.mjs.snap
@@ -901,10 +901,18 @@ final class BaseClass {}
 
 abstract class BaseClass {}
 
+final readonly class BaseClass {}
+
+readonly final class BaseClass {}
+
 final class BaseClass extends MyOtherClass {}
 
 abstract class BaseClass extends MyOtherClass {}
 
+final readonly class BaseClass extends MyOtherClass {}
+
+readonly final class BaseClass extends MyOtherClass {}
+
 final class BaseClass extends MyOtherVeryVeryVeryVeVeryVeryVeryVeryVeryLongClass {}
 
 abstract class BaseClass extends MyOtherVeryVeryVeryVeVeryVeryVeryVVeryLongClass {}
@@ -1398,6 +1406,14 @@ abstract class BaseClass
 {
 }
 
+final readonly class BaseClass
+{
+}
+
+final readonly class BaseClass
+{
+}
+
 final class BaseClass extends MyOtherClass
 {
 }
@@ -1406,6 +1422,14 @@ abstract class BaseClass extends MyOtherClass
 {
 }
 
+final readonly class BaseClass extends MyOtherClass
+{
+}
+
+final readonly class BaseClass extends MyOtherClass
+{
+}
+
 final class BaseClass extends MyOtherVeryVeryVeryVeVeryVeryVeryVeryVeryLongClass
 {
 }

diff --git a/tests/class/class.php b/tests/class/class.php
@@ -266,10 +266,18 @@ final class BaseClass {}
 
 abstract class BaseClass {}
 
+final readonly class BaseClass {}
+
+readonly final class BaseClass {}
+
 final class BaseClass extends MyOtherClass {}
 
 abstract class BaseClass extends MyOtherClass {}
 
+final readonly class BaseClass extends MyOtherClass {}
+
+readonly final class BaseClass extends MyOtherClass {}
+
 final class BaseClass extends MyOtherVeryVeryVeryVeVeryVeryVeryVeryVeryLongClass {}
 
 abstract class BaseClass extends MyOtherVeryVeryVeryVeVeryVeryVeryVVeryLongClass {}