Merge pull request #1614 from JonidBendo/master

php-cs-fixer allow risky option
Glavin001 · Apr 21, 2017 · 8ae9669 · 8ae9669
2 parents f82cbc3 + 449d95b
commit 8ae9669
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 0 deletions.
diff --git a/docs/options.md b/docs/options.md
@@ -9570,6 +9570,7 @@ Specify a configuration file which will override the default name of .perltidyrc
 | `disabled` | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | `default_beautifier` | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | `beautify_on_save` | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| `allow_risky` | :white_check_mark: | :x: | :x: |
 | `cs_fixer_path` | :white_check_mark: | :x: | :x: |
 | `cs_fixer_version` | :white_check_mark: | :x: | :x: |
 | `fixers` | :white_check_mark: | :x: | :x: |
@@ -9637,6 +9638,34 @@ Automatically beautify PHP files on save
 2. Go into *Packages* and search for "*Atom Beautify*" package.
 3. Find the option "*Beautify On Save*" and change it to your desired configuration.
 
+#####  [Allow risky rules](#allow-risky-rules) 
+
+**Namespace**: `php`
+
+**Key**: `allow_risky`
+
+**Default**: `no`
+
+**Type**: `string`
+
+**Enum**:  `no`  `yes` 
+
+**Supported Beautifiers**:  [`PHP-CS-Fixer`](#php-cs-fixer) 
+
+**Description**:
+
+allow risky rules to be applied (PHP-CS-Fixer 2 only) (Supported by PHP-CS-Fixer)
+
+**Example `.jsbeautifyrc` Configuration**
+
+```json
+{
+    "php": {
+        "allow_risky": "no"
+    }
+}
+```
+
 #####  [PHP-CS-Fixer Path](#php-cs-fixer-path) 
 
 **Namespace**: `php`
@@ -17421,6 +17450,34 @@ Add rule(s). i.e. line_ending,-full_opening_tag,@PSR2 (PHP-CS-Fixer 2 only) (Sup
 }
 ```
 
+#####  [Allow risky rules](#allow-risky-rules) 
+
+**Namespace**: `php`
+
+**Key**: `allow_risky`
+
+**Default**: `no`
+
+**Type**: `string`
+
+**Enum**:  `no`  `yes` 
+
+**Supported Beautifiers**:  [`PHP-CS-Fixer`](#php-cs-fixer) 
+
+**Description**:
+
+allow risky rules to be applied (PHP-CS-Fixer 2 only) (Supported by PHP-CS-Fixer)
+
+**Example `.jsbeautifyrc` Configuration**
+
+```json
+{
+    "php": {
+        "allow_risky": "no"
+    }
+}
+```
+
 #####  [PHPCBF Path](#phpcbf-path) 
 
 **Namespace**: `php`

diff --git a/src/beautifiers/php-cs-fixer.coffee b/src/beautifiers/php-cs-fixer.coffee
@@ -24,6 +24,7 @@ module.exports = class PHPCSFixer extends Beautifier
       "fix"
       "--rules=#{options.rules}" if options.rules
       "--config=#{configFile}" if configFile
+      "--allow-risky=#{options.allow_risky}" if options.allow_risky
       "--using-cache=no"
     ]
     if version is 1

diff --git a/src/languages/php.coffee b/src/languages/php.coffee
@@ -44,6 +44,12 @@ module.exports = {
       type: 'string'
       default: ""
       description: "Add rule(s). i.e. line_ending,-full_opening_tag,@PSR2 (PHP-CS-Fixer 2 only)"
+    allow_risky:
+      title: "Allow risky rules"
+      type: 'string'
+      default: "no"
+      enum: ["no", "yes"]
+      description: "allow risky rules to be applied (PHP-CS-Fixer 2 only)"
     phpcbf_path:
       title: "PHPCBF Path"
       type: 'string'

diff --git a/src/options.json b/src/options.json
@@ -5852,6 +5852,24 @@
           "namespace": "php"
         }
       },
+      "allow_risky": {
+        "title": "Allow risky rules",
+        "type": "string",
+        "default": "no",
+        "enum": [
+          "no",
+          "yes"
+        ],
+        "description": "allow risky rules to be applied (PHP-CS-Fixer 2 only) (Supported by PHP-CS-Fixer)",
+        "beautifiers": [
+          "PHP-CS-Fixer"
+        ],
+        "key": "allow_risky",
+        "language": {
+          "name": "PHP",
+          "namespace": "php"
+        }
+      },
       "phpcbf_path": {
         "title": "PHPCBF Path",
         "type": "string",