netresearch / kite

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/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) {

src/ExpressionLanguage/Lexer.php

Spacing +2 added lines, -2 removed lines

@@ -172,10 +172,10 @@
                 }
                 if ($isTest) {
                     if ($isFunctionCall) {
-                        throw new SyntaxError('Can\'t use function return value in write context',  $stream->current->cursor);
+                        throw new SyntaxError('Can\'t use function return value in write context', $stream->current->cursor);
                     }
                     if (!$stream->current->test(Token::PUNCTUATION_TYPE, ')')) {
-                        throw new SyntaxError('Expected )',  $stream->current->cursor);
+                        throw new SyntaxError('Expected )', $stream->current->cursor);
                     }
                     $tokens[] = new Token(Token::STRING_TYPE, implode('.', $names), $token->cursor);
                 } else {

src/Task/IncludeTask.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     public function execute()
     {
         ob_start(
-            function ($output) {
+            function($output) {
                 $this->console->output($output, false);
                 return '';
             }, 2, 0

src/Workflow/RenderReference.php

Spacing +19 added lines, -19 removed lines

@@ -60,7 +60,7 @@ 
     public function assemble()
     {
         $this->callback(
-            function () {
+            function() {
                 $this->findLoaders();
                 $file = $this->get('file');
                 $this->console->getFilesystem()->ensureDirectoryExists(dirname($file));
@@ -109,7 +109,7 @@ 
 
         foreach (['task', 'workflow'] as $type) {
             $lines[] = '';
-            $lines[] = ucfirst($type) . 's';
+            $lines[] = ucfirst($type).'s';
             $lines[] = str_repeat('=', strlen($type) + 1);
             $lines[] = '';
             $taskObjects = $this->loadTaskObjects($type);
@@ -139,7 +139,7 @@ 
                     $lines[] = 'Options';
                     $lines[] = '```````';
                     $lines[] = '';
-                    $this->renderVariables($lines, $taskVariables, $type . '-' . $name);
+                    $this->renderVariables($lines, $taskVariables, $type.'-'.$name);
                 }
                 if ($taskCommonVariables) {
                     $lines[] = 'Common options';
@@ -175,7 +175,7 @@ 
         $keys = ['type', 'default', 'required', 'label'];
         $lines[] = '   * - Name';
         foreach ($keys as $key) {
-            $lines[] = '     - ' . ucfirst($key);
+            $lines[] = '     - '.ucfirst($key);
         }
 
         foreach ($variables as $configName => $config) {
@@ -184,11 +184,11 @@ 
             }
             $lines[] = '   * - ';
             $lines[] = '';
-            $lines[] = '       .. |' . $anchorPrefix . '-' . $configName . '| replace:: ' . $configName;
+            $lines[] = '       .. |'.$anchorPrefix.'-'.$configName.'| replace:: '.$configName;
             $lines[] = '';
-            $lines[] = '       .. _' . $anchorPrefix . '-' . $configName . ':';
+            $lines[] = '       .. _'.$anchorPrefix.'-'.$configName.':';
             $lines[] = '';
-            $lines[] = '       ' . $configName;
+            $lines[] = '       '.$configName;
             $lines[] = '';
             foreach ($keys as $key) {
                 if (!array_key_exists($key, $config)) {
@@ -197,7 +197,7 @@ 
                     $v = $config[$key];
                     $value = $v === null ? 'null' : ($v === true ? 'true' : ($v === false ? 'false' : $v));
                     if (is_string($value)) {
-                        $value = ':code:`' . $value . '`';
+                        $value = ':code:`'.$value.'`';
                     }
                 } elseif ($key === 'required') {
                     $value = $config[$key] === true ? 'X' : $config[$key];
@@ -205,12 +205,12 @@ 
                     $value = $config[$key];
                 }
                 if (is_array($value)) {
-                    $value = "\n\n       .. code::php\n\n           " . str_replace("\n", "\n\n           ", call_user_func('print' . '_r', $value, true)) . "\n\n";
+                    $value = "\n\n       .. code::php\n\n           ".str_replace("\n", "\n\n           ", call_user_func('print'.'_r', $value, true))."\n\n";
                 } else {
                     $value = str_replace("\n", "\n\n       ", $value);
                 }
-                $value = preg_replace('/\{@see\s+(' . implode('|', array_keys($variables)) . ')\}/', '|' . $anchorPrefix . '-$1|_', $value);
-                $lines[] = '     - ' . $value;
+                $value = preg_replace('/\{@see\s+('.implode('|', array_keys($variables)).')\}/', '|'.$anchorPrefix.'-$1|_', $value);
+                $lines[] = '     - '.$value;
             }
         }
         $lines[] = '';
@@ -225,8 +225,8 @@ 
     {
         static $commonVars;
         if (!is_array($commonVars)) {
-            $className = 'NetresearchKiteTask' . uniqid();
-            eval('class ' . $className . ' extends \\Netresearch\\Kite\\Task {}');
+            $className = 'NetresearchKiteTask'.uniqid();
+            eval('class '.$className.' extends \\Netresearch\\Kite\\Task {}');
             $instance = new $className($this);
             $commonVars = $instance->get('_variableConfiguration');
         }
@@ -243,7 +243,7 @@ 
     protected function loadTaskObjects($type)
     {
         $objects = [];
-        $requiredType = 'Netresearch\\Kite\\' . ucfirst($type);
+        $requiredType = 'Netresearch\\Kite\\'.ucfirst($type);
         foreach ($this->factory->getNamespaces($type) as $namespace) {
             $namespaceLength = strlen($namespace);
             if ($dir = $this->findDirectoryForNamespace($namespace)) {
@@ -251,7 +251,7 @@ 
                     if (substr($file, -4) !== '.php') {
                         continue;
                     }
-                    $class = $namespace . '\\' . substr(strtr($file, '/', '\\'), 0, -4);
+                    $class = $namespace.'\\'.substr(strtr($file, '/', '\\'), 0, -4);
                     $reflectionClass = new \ReflectionClass($class);
                     if (!$reflectionClass->isSubclassOf($requiredType) || !$reflectionClass->isInstantiable()) {
                         continue;
@@ -338,7 +338,7 @@ 
                     continue;
                 }
                 foreach ($dirs as $dir) {
-                    if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                    if (file_exists($file = $dir.DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $length))) {
                         return $file;
                     }
                 }
@@ -346,7 +346,7 @@ 
 
             // PSR-4 fallback dirs
             foreach ($loader->getFallbackDirsPsr4() as $dir) {
-                if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                     return $file;
                 }
             }
@@ -364,7 +364,7 @@ 
             foreach ($loader->getPrefixes() as $prefix => $dirs) {
                 if (0 === strpos($namespace, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -373,7 +373,7 @@ 
 
             // PSR-0 fallback dirs
             foreach ($loader->getFallbackDirs() as $dir) {
-                if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                     return $file;
                 }
             }