Merge pull request #21 from Cheppers/i20-multi-standards

Issue #20 - Comma separated standards
Sweetchuck · Jun 15, 2017 · a51afca · a51afca
2 parents ac4adfb + 11a3eed
commit a51afca
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/RoboFile.php b/RoboFile.php
@@ -254,7 +254,7 @@ protected function getTaskPhpcsLint()
 
         $options = [
             'failOn' => 'warning',
-            'standard' => 'PSR2',
+            'standards' => ['PSR2'],
             'lintReporters' => [
                 'lintVerboseReporter' => null,
             ],

diff --git a/src/Task/PhpcsLint.php b/src/Task/PhpcsLint.php
@@ -97,7 +97,6 @@ abstract class PhpcsLint extends BaseTask implements
     ];
 
     protected $simpleOptions = [
-        'standard' => 'standard',
         'reportWidth' => 'report-width',
         'severity' => 'severity',
         'errorSeverity' => 'error-severity',
@@ -107,6 +106,7 @@ abstract class PhpcsLint extends BaseTask implements
     protected $listOptions = [
         'extensions' => 'extensions',
         'sniffs' => 'sniffs',
+        'standards' => 'standard',
         'exclude' => 'exclude',
         'ignored' => 'ignore',
     ];
@@ -282,8 +282,8 @@ public function setOptions(array $options)
                     $this->setWarningSeverity($value);
                     break;
 
-                case 'standard':
-                    $this->setStandard($value);
+                case 'standards':
+                    $this->setStandards($value);
                     break;
 
                 case 'extensions':
@@ -497,23 +497,25 @@ public function setWarningSeverity(?int $value)
 
     //region Option - standard
     /**
-     * @var string
+     * @var bool[]
      */
-    protected $standard = '';
+    protected $standards = [];
 
-    public function getStandard(): string
+    public function getStandards(): array
     {
-        return $this->standard;
+        return $this->standards;
     }
 
     /**
      * Set the name or path of the coding standard to use.
      *
      * @return $this
      */
-    public function setStandard(string $name)
+    public function setStandards(array $standards)
     {
-        $this->standard = $name;
+        $this->standards = gettype(reset($standards)) === 'boolean' ?
+            $standards
+            : array_fill_keys($standards, true);
 
         return $this;
     }
@@ -736,7 +738,7 @@ protected function getCommandOptions(): array
     {
         $options = [
             'colors' => $this->getColors(),
-            'standard' => $this->getStandard(),
+            'standards' => $this->getStandards(),
             'reports' => $this->getReports(),
             'reportWidth' => $this->getReportWidth(),
             'severity' => $this->getSeverity(),
@@ -1027,7 +1029,7 @@ protected function getTaskContext($context = null)
         return [
             'name' => 'PHP_CodeSniffer',
             'command' => $this->getCommand(),
-            'standard' => $this->getStandard(),
+            'standard' => implode(',', $this->filterEnabled($this->getStandards())),
         ] + parent::getTaskContext($context);
     }
 }
diff --git a/tests/_data/RoboFile.php b/tests/_data/RoboFile.php
@@ -45,7 +45,7 @@ public function lintFilesAllInOne()
 
         return $this->taskPhpcsLintFiles()
             ->setColors(false)
-            ->setStandard('PSR2')
+            ->setStandards(['PSR2'])
             ->setFiles(['fixtures/psr2.invalid.01.php'])
             ->setReport('full')
             ->setReport('checkstyle', "$reportsDir/01.native.checkstyle.xml")
@@ -97,7 +97,7 @@ public function lintInputWithoutJar(
         }
 
         return $this->taskPhpcsLintInput()
-            ->setStandard('PSR2')
+            ->setStandards(['PSR2'])
             ->setFiles($files)
             ->addLintReporter('verbose:StdOutput', 'lintVerboseReporter')
             ->addLintReporter('verbose:file', $verboseFile)

diff --git a/tests/unit/Task/PhpcsLintFilesTest.php b/tests/unit/Task/PhpcsLintFilesTest.php
@@ -184,13 +184,17 @@ public function casesGetCommand(): array
                 "phpcs --error-severity='0'",
                 ['errorSeverity' => '0'],
             ],
-            'standard-false' => [
+            'standards-empty' => [
                 'phpcs',
-                ['standard' => false],
+                ['standards' => []],
             ],
-            'standard-value' => [
-                "phpcs --standard='Drupal'",
-                ['standard' => 'Drupal'],
+            'standards-vector' => [
+                "phpcs --standard='a,b'",
+                ['standards' => ['a', 'b', 'a']],
+            ],
+            'standards-boolean' => [
+                "phpcs --standard='a,c'",
+                ['standards' => ['a' => true, 'b' => false, 'c' => true]],
             ],
             'extensions-empty' => [
                 "phpcs",