Fix small issues

Author: veewee

doc/tasks/phplint.md

@@ -9,7 +9,7 @@ parameters:
         phplint:
             exclude: []
             jobs: ~
-            triggered_by: ['php']
+            triggered_by: ['php', 'phtml', 'php3', 'php4', 'php5']
 ```
 **exclude**
 
@@ -28,6 +28,6 @@ defaults to 10.
 
 **trigered_by**
 
-*Default: ['php']*
+*Default: ['php', 'phtml', 'php3', 'php4', 'php5']*
 
 Any file extensions that you wish to be passed to the linter.

spec/GrumPHP/Collection/ProcessArgumentsCollectionSpec.php

@@ -34,6 +34,15 @@ function it_should_be_able_to_add_optional_argument()
         $this->getValues()->shouldBe(array('--argument=value'));
     }
 
+    function it_should_be_able_to_add_optional_argument_with_separated_value()
+    {
+        $this->addOptionalArgumentWithSeparatedValue('--argument', null);
+        $this->getValues()->shouldBe(array());
+
+        $this->addOptionalArgumentWithSeparatedValue('--argument', 'value');
+        $this->getValues()->shouldBe(array('--argument', 'value'));
+    }
+
     function it_should_be_able_to_add_optional_comma_separated_argument()
     {
         $this->addOptionalCommaSeparatedArgument('--argument=%s', array());

spec/GrumPHP/Task/PHPLintSpec.php renamed to spec/GrumPHP/Task/PhpLintSpec.php

@@ -14,7 +14,7 @@
 use Symfony\Component\Finder\SplFileInfo;
 use Symfony\Component\Process\Process;
 
-class PHPLintSpec extends ObjectBehavior
+class PhpLintSpec extends ObjectBehavior
 {
 
     function let(GrumPHP $grumPHP, ProcessBuilder $processBuilder, ProcessFormatterInterface $formatter)
@@ -25,7 +25,7 @@ function let(GrumPHP $grumPHP, ProcessBuilder $processBuilder, ProcessFormatterI
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('GrumPHP\Task\PHPLint');
+        $this->shouldHaveType('GrumPHP\Task\PhpLint');
     }
 
     function it_should_have_a_name()

src/GrumPHP/Collection/ProcessArgumentsCollection.php

@@ -35,6 +35,20 @@ public function addOptionalArgument($argument, $value)
         $this->add(sprintf($argument, $value));
     }
 
+    /**
+     * @param string $argument
+     * @param string $value
+     */
+    public function addOptionalArgumentWithSeparatedValue($argument, $value)
+    {
+        if (!$value) {
+            return;
+        }
+
+        $this->add($argument);
+        $this->add($value);
+    }
+
     /**
      * @param string $argument
      * @param array  $values

src/GrumPHP/Task/PHPLint.php renamed to src/GrumPHP/Task/PhpLint.php

@@ -12,7 +12,7 @@
 /**
  * PHP parallel lint task.
  */
-class PHPLint extends AbstractExternalTask
+class PhpLint extends AbstractExternalTask
 {
     /**
      * @return string
@@ -31,7 +31,7 @@ public function getConfigurableOptions()
         $resolver->setDefaults(array(
             'jobs' => null,
             'exclude' => array(),
-            'triggered_by' => array('php'),
+            'triggered_by' => array('php', 'phtml', 'php3', 'php4', 'php5'),
         ));
 
         $resolver->setAllowedTypes('jobs', array('int', 'null'));
@@ -57,18 +57,13 @@ public function run(ContextInterface $context)
         $config = $this->getConfiguration();
         $files  = $context->getFiles()->extensions($config['triggered_by']);
 
-        $args = $this->processBuilder->createArgumentsForCommand('parallel-lint');
-        $args->add('--no-colors');
-        if (!empty($config['jobs'])) {
-            $args->add('-j');
-            $args->add($config['jobs']);
-        }
-        $args->addArgumentArrayWithSeparatedValue('--exclude', $config['exclude']);
-        $args->add('-e');
-        $args->addOptionalCommaSeparatedArgument('%s', $config['triggered_by']);
-        $args->addFiles($files);
+        $arguments = $this->processBuilder->createArgumentsForCommand('parallel-lint');
+        $arguments->add('--no-colors');
+        $arguments->addOptionalArgumentWithSeparatedValue('-j', $config['jobs']);
+        $arguments->addArgumentArrayWithSeparatedValue('--exclude', $config['exclude']);
+        $arguments->addFiles($files);
 
-        $process = $this->processBuilder->buildProcess($args);
+        $process = $this->processBuilder->buildProcess($arguments);
         $process->run();
 
         if (!$process->isSuccessful()) {