Support Robo v1.X

RoboFile.php

@@ -5,4 +5,5 @@
 class RoboFile extends \Robo\Tasks
 {
     use CodeAnalysisTasks;
+    use Task\RoboAdapter;
 }

composer.json

@@ -19,7 +19,7 @@
     "require": {
         "php": ">=5.4",
         "ext-xsl": "*",
-        "consolidation/robo": "<1",
+        "consolidation/robo": "<=1",
         "phpmd/phpmd" : "*",
         "phploc/phploc": "*",
         "symfony/dependency-injection": ">=2.8",

phpqa

@@ -35,7 +35,7 @@ require_once COMPOSER_VENDOR_DIR . '/autoload.php';
  */
 class QARunner extends \Robo\Runner
 {
-    protected function loadRoboFile()
+    protected function loadRoboFile($output = null)
     {
         require_once __DIR__ . "/RoboFile.php";
         return true;
@@ -51,4 +51,5 @@ if ($isNotToolsCommand) {
 
 // run robo
 $robo = new QARunner('Edge\QA\RoboFile');
-$robo->execute($argv);
+$result = $robo->execute($argv);
+exit($result);

src/CodeAnalysisTasks.php

@@ -171,7 +171,7 @@ private function ciClean()
 
     private function runTools()
     {
-        $group = $this->options->isParallel ? new Task\ParallelExec() : new Task\NonParallelExec();
+        $group = $this->taskPhpqaRunner($this->options->isParallel);
         foreach ($this->usedTools as $tool) {
             $exec = $this->toolToExec($tool);
             $tool->process = $group->process($exec);
@@ -187,9 +187,9 @@ private function toolToExec(RunningTool $tool)
         $method = str_replace('-', '', $tool);
         foreach ($this->{$method}($tool) as $arg => $value) {
             if (is_int($arg)) {
-                $process->arg($value);
+                $this->addArgToExec($process, $value);
             } else {
-                $process->arg($tool->buildOption($arg, $value));
+                $this->addArgToExec($process, $tool->buildOption($arg, $value));
             }
         }
         return $process;

src/Task/NonParallelExecV0.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Edge\QA\Task;
+
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Process\Process;
+
+// Adapter for Robo v0.X
+class NonParallelExecV0 extends NonParallelExecV1
+{
+    private $progress;
+
+    protected function startProgressIndicator()
+    {
+        $this->progress = new ProgressBar($this->getOutput());
+        $this->progress->start(count($this->processes));
+    }
+
+    protected function advanceProgressIndicator($steps = 1)
+    {
+        $this->progress->advance($steps);
+    }
+
+    protected function stopProgressIndicator()
+    {
+        $this->getOutput()->writeln("");
+    }
+
+    protected function printProcessResult(Process $process)
+    {
+        $this->getOutput()->writeln("");
+        $this->printTaskInfo(
+            "Output for <fg=white;bg=magenta> " . $process->getCommandLine()." </fg=white;bg=magenta>"
+        );
+        $this->getOutput()->writeln($process->getOutput(), OutputInterface::OUTPUT_RAW);
+        if ($process->getErrorOutput()) {
+            $this->getOutput()->writeln("<error>" . $process->getErrorOutput() . "</error>");
+        }
+    }
+}

src/Task/NonParallelExec.php → src/Task/NonParallelExecV1.php

@@ -2,9 +2,9 @@
 
 namespace Edge\QA\Task;
 
-use Symfony\Component\Console\Helper\ProgressBar;
-use Symfony\Component\Console\Output\OutputInterface;
+use Consolidation\Log\ConsoleLogLevel;
 use Robo\Result;
+use Symfony\Component\Process\Process;
 
 /**
  * The task has similar output, same signatures as ParallelExec,
@@ -16,34 +16,26 @@
  * - prints phploc's output when one command failed
  *      phpqa --tools phpcs,phploc,phpmd --output file --execution s --quiet
  */
-class NonParallelExec extends ParallelExec
+class NonParallelExecV1 extends ParallelExec
 {
     public function run()
     {
         foreach ($this->processes as $process) {
             $this->printTaskInfo($process->getCommandLine());
         }
 
-        $progress = new ProgressBar($this->getOutput());
-        $progress->start(count($this->processes));
+        $this->startProgressIndicator();
         $this->startTimer();
 
         foreach ($this->processes as $process) {
             $process->run();
-            $progress->advance();
+            $this->advanceProgressIndicator();
             if ($this->isPrinted) {
-                $this->getOutput()->writeln("");
-                $this->printTaskInfo(
-                    "Output for <fg=white;bg=magenta> " . $process->getCommandLine()." </fg=white;bg=magenta>"
-                );
-                $this->getOutput()->writeln($process->getOutput(), OutputInterface::OUTPUT_RAW);
-                if ($process->getErrorOutput()) {
-                    $this->getOutput()->writeln("<error>" . $process->getErrorOutput() . "</error>");
-                }
+                $this->printProcessResult($process);
             }
         }
 
-        $this->getOutput()->writeln("");
+        $this->stopProgressIndicator();
         $this->stopTimer();
 
         $errorMessage = '';
@@ -61,4 +53,15 @@ public function run()
 
         return new Result($this, $exitCode, $errorMessage, ['time' => $this->getExecutionTime()]);
     }
+
+    protected function printProcessResult(Process $process)
+    {
+        $this->printTaskInfo(
+            "Output for <fg=white;bg=magenta> " . $process->getCommandLine()." </fg=white;bg=magenta>"
+        );
+        $this->printTaskOutput(ConsoleLogLevel::SUCCESS, $process->getOutput(), $this->getTaskContext());
+        if ($process->getErrorOutput()) {
+            $this->printTaskOutput(ConsoleLogLevel::ERROR, $process->getErrorOutput(), $this->getTaskContext());
+        }
+    }
 }

src/Task/RoboAdapter.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Edge\QA\Task;
+
+trait RoboAdapter
+{
+    protected function taskPhpqaRunner($isParallel)
+    {
+        $getClass = function ($class) {
+            return "Edge\QA\Task\\{$class}";
+        };
+        $class = $isParallel
+            ? $getClass('ParallelExec')
+            : ($this->isRoboVersionOne() ? $getClass('NonParallelExecV1') : $getClass('NonParallelExecV0'));
+        if ($this->isRoboVersionOne()) {
+            return $this->task($class);
+        } else {
+            return new $class();
+        }
+    }
+
+    protected function addArgToExec($exec, $arg)
+    {
+        if ($this->isRoboVersionOne()) {
+            return $exec->rawArg($arg);
+        } else {
+            return $exec->arg($arg);
+        }
+    }
+
+    private function isRoboVersionOne()
+    {
+        static $isVersionOne = null;
+        if ($isVersionOne === null) {
+            $isVersionOne = method_exists('Robo\Common\CommandArguments', 'rawArg');
+        }
+        return $isVersionOne;
+    }
+}

tests/.travis/phpstan.neon

@@ -6,6 +6,10 @@ parameters:
     autoload_directories: 
         - %currentWorkingDirectory%/tests 
     autoload_files:
-        - %currentWorkingDirectory%/RoboFile.php 
+        - %currentWorkingDirectory%/RoboFile.php
+    # exclude robo v0/v1 compatibility classes - it's not possible to analyze them with phsptan (only one robo version is installed)
+    excludes_analyse:
+        - %currentWorkingDirectory%/src/Task/NonParallelExecV0.php
+        - %currentWorkingDirectory%/src/Task/NonParallelExecV1.php
     ignoreErrors:
         - '#Call to an undefined method Prophecy\\Prophecy\\ObjectProphecy::[a-zA-Z0-9_]+\(\)#'