Rename trailingComma to trailingCommaPHP (#1059)

* Rename trailingComma option to trailingCommaPHP #964

* Update README with the new trailingCommaPHP

* Add support for comon trailingComma: all option

Author: Lukas

README.md

@@ -166,7 +166,7 @@ Prettier for PHP supports the following options:
 | `tabWidth`      | `4`       | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#tab-width))                                                                                                                                                                                                                              |
 | `useTabs`       | `false`   | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#tabs))                                                                                                                                                                                                                                   |
 | `singleQuote`   | `false`   | If set to `"true"`, strings that use double quotes but do not rely on the features they add, will be reformatted. Example: `"foo" -> 'foo'`, `"foo $bar" -> "foo $bar"`.                                                                                                                                                   |
-| `trailingComma` | `"none"`  | If set to `"all"`, trailing commas will be added wherever possible. <br> If set to `"php7.2"`, trailing commas will be added to multiline arrays, lists and uses. <br> If set to `"php5"`, trailing commas will be added to multiline arrays and lists. <br> if set to `"none"`, no trailing commas.                       |
+| `trailingCommaPHP` | `"none"`  | If set to `"all"`, trailing commas will be added wherever possible. <br> If set to `"php7.2"`, trailing commas will be added to multiline arrays, lists and uses. <br> If set to `"php5"`, trailing commas will be added to multiline arrays and lists. <br> if set to `"none"`, no trailing commas.                       |
 | `braceStyle`    | `"psr-2"` | If set to `"psr-2"`, prettier will move open brace for code blocks (classes, functions and methods) onto new line. <br> If set to `"1tbs"`, prettier will move open brace for code blocks (classes, functions and methods) onto same line. |
 | `requirePragma` | `false`   | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#require-pragma))                                                                                                                                                                                                                         |
 | `insertPragma`  | `false`   | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#insert-pragma))                                                                                                                                                                                                                          |

src/options.js

@@ -3,7 +3,7 @@
 const CATEGORY_PHP = "PHP";
 
 module.exports = {
-  trailingComma: {
+  trailingCommaPHP: {
     since: "0.0.0",
     category: CATEGORY_PHP,
     type: "choice",

src/printer.js

@@ -62,7 +62,7 @@ const {
 function shouldPrintComma(options, level) {
   level = level || "none";
 
-  switch (options.trailingComma) {
+  switch (options.trailingCommaPHP) {
     case "all":
       if (level === "all") {
         return true;
@@ -79,7 +79,12 @@ function shouldPrintComma(options, level) {
       }
     // fallthrough
     case "none":
+      return false;
+    // fallthrough
     default:
+      if (options.trailingComma === "all") {
+        return true;
+      }
       return false;
   }
 }