php-cs-fixer - allow custom .php_cs configuration instead of mapping …

…rules in .phpqa.yml

.phpqa.yml

@@ -18,6 +18,8 @@ php-cs-fixer:
     allowRiskyRules: false
     # by default the tool is runned in dry-run mode (no fixers are applied)
     isDryRun: true
+    # alternatively you can define path to your .phpcs_file (rules/allowRiskyRules config is ignored)
+    config: null
 
 phpmd:
     standard: app/phpmd.xml

README.md

@@ -203,6 +203,7 @@ Tool | Settings | Default Value | Your value
 [phpcs.reports](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Reporting) | Report types | [`full`](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Reporting#printing-full-and-summary-reports) report in [cli mode](#output-modes), [`checkstyle`](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Reporting#printing-a-checkstyle-report) in [file mode](#output-modes) | Predefined [report types](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Reporting) or [custom reports](https://github.com/wikidi/codesniffer#examples)
 [php-cs-fixer.rules](http://cs.sensiolabs.org/#usage) | Coding standard rules | `@PSR2` | String value
 [php-cs-fixer.allowRiskyRules](http://cs.sensiolabs.org/#usage) | Whether risky rules may run  | `false` | Boolean value
+[php-cs-fixer.config](http://cs.sensiolabs.org/#usage) | Load configuration from [file](https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/.php_cs.dist) | `null` | Path to `.phpcs` file
 [php-cs-fixer.isDryRun](http://cs.sensiolabs.org/#usage) | If code is just analyzed or fixers are applied  | `true` | Boolean value
 [phpmd](http://phpmd.org/documentation/creating-a-ruleset.html) | Ruleset | [Edgedesign's standard](/app/phpmd.xml) | Path to ruleset
 [phpcpd](https://github.com/sebastianbergmann/phpcpd/blob/de9056615da6c1230f3294384055fa7d722c38fa/src/CLI/Command.php#L136) | Minimum number of lines/tokens for copy-paste detection | 5 lines, 70 tokens | 

src/CodeAnalysisTasks.php

@@ -402,11 +402,18 @@ private function phpcsfixer()
         $args = [
             'fix',
             $analyzedDir,
-            'rules' => $this->config->value('php-cs-fixer.rules'),
             'verbose' => '',
             'format' => $this->options->isSavedToFiles ? 'junit' : 'txt',
-            'allow-risky' => $this->config->value('php-cs-fixer.allowRiskyRules') ? 'yes' : 'no',
         ];
+        $configFile = $this->config->value('php-cs-fixer.config');
+        if ($configFile) {
+            $args['config'] = $configFile;
+        } else {
+            $args += [
+                'rules' => $this->config->value('php-cs-fixer.rules'),
+                'allow-risky' => $this->config->value('php-cs-fixer.allowRiskyRules') ? 'yes' : 'no',
+            ];
+        }
         if ($this->config->value('php-cs-fixer.isDryRun')) {
             $args['dry-run'] = '';
         }

tests/Config/ConfigTest.php

@@ -16,6 +16,7 @@ public function testLoadDefaultConfig()
         assertThat($config->value('php-cs-fixer.rules'), is(nonEmptyString()));
         assertThat($config->value('php-cs-fixer.isDryRun'), identicalTo(true));
         assertThat($config->value('php-cs-fixer.allowRiskyRules'), identicalTo(false));
+        assertThat($config->path('php-cs-fixer.config'), is(nullValue()));
         assertThat($config->path('phpmd.standard'), is(nonEmptyString()));
         assertThat($config->value('phpstan.level'), identicalTo(0));
     }