netresearch / kite

src/Console/Application.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Netresearch\Kite\Exception;
 use Netresearch\Kite\Service\Config;
 use Netresearch\Kite\Console\Command\JobCommand;
-use Netresearch\Kite\Service\Factory;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;

Spacing +18 added lines, -18 removed lines

@@ -81,7 +81,7 @@ 
             list($dir, $file) = $dirAndFile;
             if (is_dir($dir)) {
                 $app = $appName;
-                $expectedFile = $dir . '/' . $file;
+                $expectedFile = $dir.'/'.$file;
                 break;
             }
         }
@@ -91,9 +91,9 @@ 
         } catch (\Exception $e) {
             if ($app) {
                 $message = [
-                    'You appear to be in a ' . $app . ' root directory but',
+                    'You appear to be in a '.$app.' root directory but',
                     'there is no kite config file at the expected',
-                    'location (' . $expectedFile . ').'
+                    'location ('.$expectedFile.').'
                 ];
             } else {
                 $message = [
@@ -103,9 +103,9 @@ 
                     'The config file path is expected to be:',
                 ];
                 foreach ($indicators as $appName => $dirAndFile) {
-                    $message[] = '  - "' . implode('/', $dirAndFile) . '" for ' . $appName . ' applications or';
+                    $message[] = '  - "'.implode('/', $dirAndFile).'" for '.$appName.' applications or';
                 }
-                $message[] = '  - "' . $expectedFile . '" for any other application';
+                $message[] = '  - "'.$expectedFile.'" for any other application';
             }
             $lMax = 0;
             foreach ($message as $line) {
@@ -113,12 +113,12 @@ 
                     $lMax = $l;
                 }
             }
-            $this->output->writeln('<warning>' . str_repeat(' ', $lMax + 4) . '</warning>');
+            $this->output->writeln('<warning>'.str_repeat(' ', $lMax + 4).'</warning>');
             foreach ($message as $line) {
                 $line = str_pad($line, $lMax + 2);
                 $this->output->writeln("<warning>  $line</warning>");
             }
-            $this->output->writeln('<warning>' . str_repeat(' ', $lMax + 4) . '</warning>');
+            $this->output->writeln('<warning>'.str_repeat(' ', $lMax + 4).'</warning>');
         }
     }
 
@@ -135,7 +135,7 @@ 
             . "| ' /| | __/ _ \\\n"
             . "| . \\| | |_| __/\n"
             . "|_|\\_|_|\\__\\___|\n\n"
-            . $this->getLongVersion() . "\n\n"
+            . $this->getLongVersion()."\n\n"
             . $this->getSelfPackage()->description;
 
         return $help;
@@ -153,7 +153,7 @@ 
         if (isset($package->source)) {
             $v .= " <comment>({$package->source->reference})</comment>";
         }
-        $v .= ' ' . $package->time;
+        $v .= ' '.$package->time;
         return $v;
     }
 
@@ -166,7 +166,7 @@ 
     {
         static $package = null;
         if (!$package) {
-            $files = [__DIR__ . '/../../../../composer/installed.json', __DIR__ . '/vendor/composer/installed.json'];
+            $files = [__DIR__.'/../../../../composer/installed.json', __DIR__.'/vendor/composer/installed.json'];
             foreach ($files as $file) {
                 if (file_exists($file)) {
                     $installed = json_decode(file_get_contents($file));
@@ -183,9 +183,9 @@ 
                 $process = new Process('git symbolic-ref -q --short HEAD || git describe --tags --exact-match; git rev-parse HEAD; git show -s --format=%ct HEAD', $kitePath);
                 $process->run();
                 if ($output = $process->getOutput()) {
-                    $package = json_decode(file_get_contents($kitePath . '/composer.json'));
+                    $package = json_decode(file_get_contents($kitePath.'/composer.json'));
                     list($name, $revision, $tstamp) = explode("\n", trim($output), 3);
-                    $package->version = preg_match('/^v?[0-9]+\.[0-9]+\.[0-9]+(-[a-z0-9]+)?$/i', $name) ? $name : 'dev-' . $name;
+                    $package->version = preg_match('/^v?[0-9]+\.[0-9]+\.[0-9]+(-[a-z0-9]+)?$/i', $name) ? $name : 'dev-'.$name;
                     $package->source = (object) ['reference' => $revision];
                     $package->time = date('Y-m-d H:i:s', $tstamp);
                 } else {
@@ -207,7 +207,7 @@ 
         $definition->addOption(new InputOption('workflow', null, InputOption::VALUE_OPTIONAL, 'Run a workflow on the fly'));
 
         if (isset($_SERVER['HOME']) && is_writable($_SERVER['HOME'])) {
-            $debugDir = $_SERVER['HOME'] . '/.kite/log';
+            $debugDir = $_SERVER['HOME'].'/.kite/log';
         } else {
             $debugDir = false;
         }
@@ -251,19 +251,19 @@ 
                 $strInput .= ' --help';
             }
             $workflow = $input->getParameterOption('--workflow');
-            $jobName = 'generic:workflow:' . $workflow;
+            $jobName = 'generic:workflow:'.$workflow;
             $this->config->configureJob($jobName, array('workflow' => $workflow));
             $command = new JobCommand($jobName, $this->config);
             $this->add($command);
 
-            $parameterOption = '--workflow=' . $workflow;
+            $parameterOption = '--workflow='.$workflow;
             $input = new StringInput(
                 rtrim(
-                    $jobName . ' ' .
+                    $jobName.' '.
                     str_replace(
                         array(
-                            $parameterOption . ' ',
-                            ' ' . $parameterOption,
+                            $parameterOption.' ',
+                            ' '.$parameterOption,
                             $parameterOption
                         ), '', $strInput
                     )

src/Console/Output/ConsoleOutput.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     /**
      * ConsoleOutput constructor.
      *
-     * @param int|mixed                     $verbosity The verbosity
+     * @param integer                     $verbosity The verbosity
      * @param boolean                       $decorated If output should be decorated
      * @param OutputFormatterInterface|null $formatter Formatter
      */

src/Service/Console.php

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 namespace Netresearch\Kite\Service;
 
 use Netresearch\Kite\Console\Output\Output;
-
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper;
 use Symfony\Component\Console\Input\InputInterface;

src/Service/Process.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
      * @param callable|null $callback A PHP callback to run whenever there is some
      *                                output available on STDOUT or STDERR
      *
-     * @return mixed The output of the shell command or FALSE if the command returned a non-zero exit code and $ignoreErrors was enabled.
+     * @return null|string The output of the shell command or FALSE if the command returned a non-zero exit code and $ignoreErrors was enabled.
      */
     public function run($callback = NULL)
     {

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
         } elseif (is_array($command)) {
             $command = implode('; ', $command);
         } else {
-            throw new \Netresearch\Kite\Exception('Command must be string or array, ' . gettype($command) . ' given.', 1312454906);
+            throw new \Netresearch\Kite\Exception('Command must be string or array, '.gettype($command).' given.', 1312454906);
         }
 
         parent::__construct($command, $cwd, null, null, null);
@@ -141,14 +141,14 @@ 
     {
         $command = $this->getCommandLine();
 
-        $this->console->output('<cmd>' . $this->getWorkingDirectory() . ' > ' . $command . '</cmd>', OutputInterface::VERBOSITY_VERBOSE);
+        $this->console->output('<cmd>'.$this->getWorkingDirectory().' > '.$command.'</cmd>', OutputInterface::VERBOSITY_VERBOSE);
 
         if ($this->dryRun) {
             return null;
         }
 
         parent::run(
-            function ($type, $buffer) use ($callback) {
+            function($type, $buffer) use ($callback) {
                 if ($callback) {
                     call_user_func($callback, $type, $buffer);
                 }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
      *
      * @return mixed The output of the shell command or FALSE if the command returned a non-zero exit code and $ignoreErrors was enabled.
      */
-    public function run($callback = NULL)
+    public function run($callback = null)
     {
         $command = $this->getCommandLine();
 

src/Task/FsTask.php

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 namespace Netresearch\Kite\Task;
 
 
-use Netresearch\Kite\Exception;
 use Netresearch\Kite\Task;
 
 /**

src/Task/ShellTask.php

Doc Comments +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
     /**
      * Execute the command
      *
-     * @return mixed
+     * @return null|string
      */
     protected function executeCommand()
     {

Spacing +3 added lines, -3 removed lines

@@ -143,7 +143,7 @@ 
         $process = $this->console->createProcess($this->getCommand(), $this->get('cwd'));
         $process->setDryRun(!$this->shouldExecute());
         foreach ($this->get('processSettings') as $key => $value) {
-            $process->{'set' . ucfirst($key)}($value);
+            $process->{'set'.ucfirst($key)}($value);
         }
         return $process->run();
     }
@@ -169,7 +169,7 @@ 
                 if ($options || $arguments) {
                     throw new Exception('Can not combine argv with options or arguments');
                 }
-                $cmd .= ' ' . (is_array($argv) ? implode(' ', $argv) : $argv);
+                $cmd .= ' '.(is_array($argv) ? implode(' ', $argv) : $argv);
             } else {
                 $cmd .= $this->renderOptions($options);
                 $cmd .= $this->renderArguments($arguments);
@@ -224,7 +224,7 @@ 
         $argumentString = '';
         foreach ($arguments as $argument) {
             $value = $this->expand($argument);
-            $argumentString .= ' ' . escapeshellarg($value);
+            $argumentString .= ' '.escapeshellarg($value);
         }
         return $argumentString;
     }

src/Task/SubTask.php

Unused Use Statements -2 removed lines

@@ -15,8 +15,6 @@
 namespace Netresearch\Kite\Task;
 use Netresearch\Kite\Task;
 use Netresearch\Kite\Tasks;
-use Netresearch\Kite\Workflow;
-use Netresearch\Kite\Exception;
 
 /**
  * Run tasks or a workflow within a task

src/Tasks.php

Doc Comments +7 added lines, -7 removed lines

@@ -426,7 +426,7 @@ 
     /**
      * Execute the next fetched task after given $task
      *
-     * @param Task|string $task Task or task name
+     * @param string $task Task or task name
      *
      * @return $this
      */
@@ -444,7 +444,7 @@ 
      * @param string $question The question
      * @param string $default  The default value
      *
-     * @return mixed|\Netresearch\Kite\Task
+     * @return string
      */
     public function answer($question, $default = null)
     {
@@ -506,11 +506,11 @@ 
      * Run a composer command
      *
      * @param string            $command         The command to execute
-     * @param array|string|null $optArg          Options and arguments
+     * @param string $optArg          Options and arguments
      *                                           {@see \Netresearch\Kite\Task\ShellTask}
      * @param array             $processSettings Settings for symfony process class
      *
-     * @return string|\Netresearch\Kite\Task\ComposerTask
+     * @return string
      */
     public function composer($command, $optArg = null, array $processSettings = array())
     {
@@ -566,7 +566,7 @@ 
      *                                           {@see \Netresearch\Kite\Task\ShellTask}
      * @param array             $processSettings Settings for symfony process class
      *
-     * @return Task\GitTask|string
+     * @return string
      */
     public function git($command, $cwd = null, $optArg = null, array $processSettings = array())
     {
@@ -576,7 +576,7 @@ 
     /**
      * Run a workflow for each of the $array's values.
      *
-     * @param array|\Traversable $array    The object to iterate over
+     * @param string $array    The object to iterate over
      * @param string|array       $as       Either string for
      *                                     foreach ($array as $as)
      *                                     or array for
@@ -633,7 +633,7 @@ 
      *                                           {@see \Netresearch\Kite\Task\ShellTask}
      * @param array             $processSettings Settings for symfony process class
      *
-     * @return Task\RemoteShellTask|string
+     * @return string
      */
     public function remoteShell($command, $cwd = null, $optArg = null, array $processSettings = array())
     {

Spacing +3 added lines, -3 removed lines

@@ -283,7 +283,7 @@ 
         if (!$name) {
             return 0;
         }
-        $key = $type . ':' . $name;
+        $key = $type.':'.$name;
         $tasksAdded = 0;
         if (array_key_exists($key, $this->job->deferredTasks)) {
             while ($task = array_shift($this->job->deferredTasks[$key])) {
@@ -310,7 +310,7 @@ 
                 $shouldRun = $if;
             } elseif (is_string($if)) {
                 $shouldRun = (boolean) $task->expand(
-                    '{' . $if . ' ? 1 : 0}'
+                    '{'.$if.' ? 1 : 0}'
                 );
             } else {
                 $shouldRun = call_user_func_array($if, array($task, $this->console));
@@ -349,7 +349,7 @@ 
                     if ($name === '@self') {
                         $name = $this->get('name');
                     }
-                    $key = $type . ':' . $name;
+                    $key = $type.':'.$name;
                     $this->job->deferredTasks[$key][] = $task;
                 }
             }

src/Workflow/Composer/Diagnose.php

Unused Use Statements -2 removed lines

@@ -12,8 +12,6 @@
  */
 
 namespace Netresearch\Kite\Workflow\Composer;
-use Netresearch\Kite\Exception;
-
 use Netresearch\Kite\Workflow;
 
 /**

Spacing +20 added lines, -20 removed lines

@@ -58,7 +58,7 @@ 
             if (substr($method, 0, 5) === 'check' && $method[5] === strtoupper($method[5])) {
                 $check = substr($method, 5);
                 $this->checks[] = $check;
-                if (method_exists($this, 'fix' . $check)) {
+                if (method_exists($this, 'fix'.$check)) {
                     $this->fixes[] = $check;
                 }
             }
@@ -68,12 +68,12 @@ 
             'check' => array(
                 'type' => 'array',
                 'option' => true,
-                'label' => 'Only execute these checks - available checks are ' . implode(', ', $this->checks),
+                'label' => 'Only execute these checks - available checks are '.implode(', ', $this->checks),
             ),
             'fix' => array(
                 'type' => 'boolean|array',
                 'option' => true,
-                'label' => 'Enable fixes and optionally reduce to certain fixes - available fixes are ' . implode(', ', $this->fixes),
+                'label' => 'Enable fixes and optionally reduce to certain fixes - available fixes are '.implode(', ', $this->fixes),
             ),
         ) + parent::configureVariables();
     }
@@ -86,7 +86,7 @@ 
     public function assemble()
     {
         $this->callback(
-            function () {
+            function() {
                 $fix = $this->get('fix');
                 $fixes = ($fix === true) ? $this->fixes : (array) $fix;
                 $checks = $this->get('check') ?: $this->checks;
@@ -120,11 +120,11 @@ 
             if ($packageNames && !in_array($package->name, $packageNames, true)) {
                 continue;
             }
-            if (is_string($message = $this->{'check' . $check}($package))) {
+            if (is_string($message = $this->{'check'.$check}($package))) {
                 if (!$packageNames && !$errors) {
                     $this->console->output(
                         str_repeat(chr(8), strlen($check))
-                        . '<fg=red;bg=black>' . $check . '</>'
+                        . '<fg=red;bg=black>'.$check.'</>'
                     );
                 }
                 $message = sprintf($message, "package <comment>$package->name</>");
@@ -133,7 +133,7 @@ 
                 if ($fix) {
                     $this->dontCheckCurrentPackageAgain = false;
                     $this->console->indent();
-                    $this->{'fix' . $check}($package);
+                    $this->{'fix'.$check}($package);
                     $this->console->outdent();
                     if (!$this->dontCheckCurrentPackageAgain) {
                         $rerunForPackages[] = $package->name;
@@ -155,7 +155,7 @@ 
             if (!$errors) {
                 $this->console->output(
                     str_repeat(chr(8), strlen($check))
-                    . '<fg=green;bg=black>' . $check . '</>'
+                    . '<fg=green;bg=black>'.$check.'</>'
                 );
             }
             $this->console->outdent();
@@ -212,7 +212,7 @@ 
             $this->git('reset', $package->path);
             $args = 'save -u';
             if ($message = $this->answer('Message for stash:')) {
-                $args .= ' ' . escapeshellarg($message);
+                $args .= ' '.escapeshellarg($message);
             }
             $this->git('stash', $package->path, $args);
             break;
@@ -283,7 +283,7 @@ 
         case 2:
             foreach ($commands as $command) {
                 $pck = "<comment>{$package->name}</comment>";
-                $this->console->output($msg = ucfirst($command) . "ing $pck...", false);
+                $this->console->output($msg = ucfirst($command)."ing $pck...", false);
                 $this->git($command, $package->path, isset($options) ? $options : null);
                 $this->console->output(
                     str_repeat(chr(8), strlen(strip_tags($msg)))
@@ -330,8 +330,8 @@ 
                         }
                         if ($package->requiredBranch && $package->requiredBranch !== $requiredBranch) {
                             $package->invalidRequirements = true;
-                            return '<error>' . array_pop($dependentPackages)
-                                . ' and ' . array_pop($dependentPackages)
+                            return '<error>'.array_pop($dependentPackages)
+                                . ' and '.array_pop($dependentPackages)
                                 . ' require %s in different branches</error>';
                         }
                         $package->requiredBranch = $requiredBranch;
@@ -343,7 +343,7 @@ 
                     }
                 }
             }
-            $constraint = $package->tag ?: 'dev-' . $package->branch;
+            $constraint = $package->tag ?: 'dev-'.$package->branch;
             if ($package->requiredBranch && $package->requiredBranch !== $package->branch) {
                 return "%s is at <comment>$constraint</comment> but is required at <comment>dev-{$package->requiredBranch}</comment>";
             }
@@ -367,8 +367,8 @@ 
         if ($package->invalidRequirements) {
             $this->doExit('Can not fix that', 1);
         }
-        $currentConstraint = $package->tag ?: 'dev-' . $package->branch;
-        $requiredConstraint = 'dev-' . $package->requiredBranch;
+        $currentConstraint = $package->tag ?: 'dev-'.$package->branch;
+        $requiredConstraint = 'dev-'.$package->requiredBranch;
         if ($package->requiredBranch) {
             $actions = array(
                 1 => "Show divergent commits between <comment>$currentConstraint</comment> and <comment>$requiredConstraint</comment> (and ask again)",
@@ -424,9 +424,9 @@ 
             if ($counts[0] || $counts[1]) {
                 $num = $counts[0] ?: $counts[1];
                 $type = $counts[0] ? 'behind</>' : 'ahead</> of';
-                return '%s is <comment>' . $num . ' commit' . ($num > 1 ? 's ' : ' ')
-                    . $type . ' locked commit <comment>'
-                    . substr($package->source->reference, 0, 7) . '</>';
+                return '%s is <comment>'.$num.' commit'.($num > 1 ? 's ' : ' ')
+                    . $type.' locked commit <comment>'
+                    . substr($package->source->reference, 0, 7).'</>';
             }
         }
         return null;
@@ -544,12 +544,12 @@ 
             $side = $i ? 'left' : 'right';
             $otherSide = $i ? 'right' : 'left';
             $args = "--$side-only --cherry-pick --pretty=format:'%C(yellow)%h %Cgreen%cd %an%Creset%n  %s' --abbrev-commit --date=local ";
-            $args .= $ref . '...';
+            $args .= $ref.'...';
             $log = $this->git('log', $package->path, $args, array('shy' => true));
             if ($log) {
                 $this->console->output('');
 
-                $title = "<info>{${$side . 'Title'}}</info> > <info>{${$otherSide . 'Title'}}</info>";
+                $title = "<info>{${$side.'Title'}}</info> > <info>{${$otherSide.'Title'}}</info>";
                 $this->output($title);
                 $this->console->output(str_repeat('-', strlen(strip_tags($title))));