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/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/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/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/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 +19 added lines, -19 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)))
@@ -332,7 +332,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>";
             }
@@ -353,8 +353,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)",
@@ -405,7 +405,7 @@ 
     protected function checkDivergeFromLock($package)
     {
         if ($package->git && !$package->isRoot) {
-            $constraint = $package->tag ? ltrim($package->tag, 'v') : 'dev-' . $package->branch;
+            $constraint = $package->tag ? ltrim($package->tag, 'v') : 'dev-'.$package->branch;
             if (($package->tag || $package->branch) && $package->version !== $constraint) {
                 if ($this->git('rev-parse', $package->path, 'HEAD') === $package->source->reference) {
                     // HEAD is tip of branch and tag - so only branch was detected
@@ -418,9 +418,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;
@@ -538,12 +538,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))));
 

src/Workflow/Composer/Merge.php

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 
 namespace Netresearch\Kite\Workflow\Composer;
 use Netresearch\Kite\Service\Composer\Package;
-use Netresearch\Kite\Task;
 use Netresearch\Kite\Workflow;
 
 

Spacing +4 added lines, -4 removed lines

@@ -77,7 +77,7 @@ 
     public function assemble()
     {
         $this->callback(
-            function () {
+            function() {
                 $mergeBranch = $this->get('branch');
                 $diagnose = !$this->get('no-diagnose');
                 $delete = $this->get('delete', false);
@@ -100,7 +100,7 @@ 
 
                     if ($delete) {
                         $this->git('branch', $package->path, array('d' => $mergeBranch));
-                        $this->git('push', $package->path, array('origin', ':' . $mergeBranch));
+                        $this->git('push', $package->path, array('origin', ':'.$mergeBranch));
                     }
                 }
 
@@ -142,10 +142,10 @@ 
                         $package->branches[] = $checkoutBranch;
                         $inferFromBranch = 'master';
                     }
-                    $this->git('fetch', $package->path, array('force' => true, 'origin', $inferFromBranch . ':' . $checkoutBranch));
+                    $this->git('fetch', $package->path, array('force' => true, 'origin', $inferFromBranch.':'.$checkoutBranch));
                     $this->git('checkout', $package->path, array($checkoutBranch));
                     $package->branch = $checkoutBranch;
-                    $package->version = 'dev-' . $checkoutBranch;
+                    $package->version = 'dev-'.$checkoutBranch;
                 } else {
                     continue;
                 }

src/Workflow/Deployment.php

Unused Use Statements -3 removed lines

@@ -14,10 +14,7 @@
 
 namespace Netresearch\Kite\Workflow;
 use Netresearch\Kite\Task;
-
 use Netresearch\Kite\Workflow;
-use Netresearch\Kite\Exception;
-
 use Symfony\Component\Console\Input\InputOption;
 
 /**

Spacing +11 added lines, -11 removed lines

@@ -88,7 +88,7 @@ 
         if (!$rollback && !$restore) {
             $this->checkout();
             $this->release = date($this->get('releaseFormat', 'YmdHis'));
-            $this->set('releaseDir', 'releases/' . $this->release);
+            $this->set('releaseDir', 'releases/'.$this->release);
             $this->release();
             $this->shareResources();
         }
@@ -195,9 +195,9 @@ 
     protected function activate()
     {
         $sub = $this->iterate('{nodes}', 'node');
-        $sub->message('<step>Activating ' . ($this->release ? 'new' : 'latest') . ' release</step>');
+        $sub->message('<step>Activating '.($this->release ? 'new' : 'latest').' release</step>');
         $sub->callback(
-            function (Task\IterateTask $iterator) {
+            function(Task\IterateTask $iterator) {
                 $links = $iterator->remoteShell('echo "`readlink previous`;`readlink current`;`readlink next`"', '{node.deployPath}');
                 list($previous, $current, $next) = explode(';', $links);
 
@@ -213,7 +213,7 @@ 
 
                     $commands = array("ln -sfn $next current; rm next");
                     if ($current) {
-                        $from = '<comment>' . basename($current) . '</comment>';
+                        $from = '<comment>'.basename($current).'</comment>';
                         array_unshift($commands, "ln -s $current previous");
                         if ($previous) {
                             array_unshift($commands, "rm previous; rm -rf $previous");
@@ -252,7 +252,7 @@ 
         $sub = $this->iterate('{nodes}', 'node');
         $sub->message('<step>Restoring previous release</step>');
         $sub->callback(
-            function (Task\IterateTask $iterator) use (&$firstPreviousRelease) {
+            function(Task\IterateTask $iterator) use (&$firstPreviousRelease) {
                 $links = $iterator->remoteShell('echo "`readlink previous`;`readlink current`;`readlink next`"', '{node.deployPath}');
                 list($previous, $current, $next) = explode(';', $links);
                 if (!$previous) {
@@ -269,7 +269,7 @@ 
                     $commands = array("ln -sfn $previous current; rm previous");
                     if ($current) {
                         array_unshift($commands, "ln -s $current next");
-                        $from = '<comment>' . basename($current) . '</comment>';
+                        $from = '<comment>'.basename($current).'</comment>';
                     } else {
                         $from = '<warning>none</warning>';
                     }
@@ -292,7 +292,7 @@ 
         $sub = $this->iterate('{shared}', array('type' => 'entries'));
         $sub->message('<step>Linking shared resources</step>');
         $sub->callback(
-            function (Task\IterateTask $iterator) {
+            function(Task\IterateTask $iterator) {
                 $type = $iterator->get('type');
                 if (!in_array($type, array('dirs', 'files'), true)) {
                     $iterator->doExit('shared may only contain keys "dirs" or "files"', 1);
@@ -311,13 +311,13 @@ 
                     }
 
                     $commands[] = 'cd {releaseDir}';
-                    $commands[] = 'rm -rf ' . $entry;
+                    $commands[] = 'rm -rf '.$entry;
                     if ($dirName) {
-                        $commands[] = 'mkdir -p ' . $dirName;
-                        $commands[] = 'cd ' . $dirName;
+                        $commands[] = 'mkdir -p '.$dirName;
+                        $commands[] = 'cd '.$dirName;
                         $subDirCount += substr_count($dirName, '/') + 1;
                     }
-                    $commands[] = 'ln -s ' . str_repeat('../', $subDirCount) . $shareDir . '/' . $entry;
+                    $commands[] = 'ln -s '.str_repeat('../', $subDirCount).$shareDir.'/'.$entry;
 
                     $iterator->remoteShell($commands, '{node.deployPath}');
                 }

src/Workflow/StageSelect.php

Unused Use Statements -3 removed lines

@@ -13,12 +13,9 @@
  */
 
 namespace Netresearch\Kite\Workflow;
-use Netresearch\Kite\Service\Factory;
 use Netresearch\Kite\Task;
-
 use Netresearch\Kite\Workflow;
 use Netresearch\Kite\Exception;
-
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**

Spacing +2 added lines, -2 removed lines

@@ -131,7 +131,7 @@ 
     public function assemble()
     {
         $this->callback(
-            function () {
+            function() {
                 $stages = $this->get('stages');
                 $stageOptions = array();
                 // Begin keys from 1
@@ -176,7 +176,7 @@ 
                     $task = clone $this->task;
                     foreach ($stages[$stage] as $key => $value) {
                         // Avoid variables overriding parent variables, by prefixing with this
-                        $task->set('this.' . $key, $value);
+                        $task->set('this.'.$key, $value);
                     }
                     $this->addTask($task);
                 }

presets/common.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
         ],
         'task' => [
             'type' => 'callback',
-            'callback' => function (\Netresearch\Kite\Job $job) {
+            'callback' => function(\Netresearch\Kite\Job $job) {
                 $git = $job->get('git');
                 $command = $job->get('cmd');
                 foreach ($job->get('composer.packages') as $package) {