@@ -19,7 +19,6 @@ |
||
| 19 | 19 | use Netresearch\Kite\Exception; |
| 20 | 20 | use Netresearch\Kite\Service\Config; |
| 21 | 21 | use Netresearch\Kite\Console\Command\JobCommand; |
| 22 | -use Netresearch\Kite\Service\Factory; |
|
| 23 | 22 | use Symfony\Component\Console\Command\Command; |
| 24 | 23 | use Symfony\Component\Console\Input\InputInterface; |
| 25 | 24 | use Symfony\Component\Console\Input\InputOption; |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | list($dir, $file) = $dirAndFile; |
| 82 | 82 | if (is_dir($dir)) { |
| 83 | 83 | $app = $appName; |
| 84 | - $expectedFile = $dir . '/' . $file; |
|
| 84 | + $expectedFile = $dir.'/'.$file; |
|
| 85 | 85 | break; |
| 86 | 86 | } |
| 87 | 87 | } |
@@ -91,9 +91,9 @@ discard block |
||
| 91 | 91 | } catch (\Exception $e) { |
| 92 | 92 | if ($app) { |
| 93 | 93 | $message = [ |
| 94 | - 'You appear to be in a ' . $app . ' root directory but', |
|
| 94 | + 'You appear to be in a '.$app.' root directory but', |
|
| 95 | 95 | 'there is no kite config file at the expected', |
| 96 | - 'location (' . $expectedFile . ').' |
|
| 96 | + 'location ('.$expectedFile.').' |
|
| 97 | 97 | ]; |
| 98 | 98 | } else { |
| 99 | 99 | $message = [ |
@@ -103,9 +103,9 @@ discard block |
||
| 103 | 103 | 'The config file path is expected to be:', |
| 104 | 104 | ]; |
| 105 | 105 | foreach ($indicators as $appName => $dirAndFile) { |
| 106 | - $message[] = ' - "' . implode('/', $dirAndFile) . '" for ' . $appName . ' applications or'; |
|
| 106 | + $message[] = ' - "'.implode('/', $dirAndFile).'" for '.$appName.' applications or'; |
|
| 107 | 107 | } |
| 108 | - $message[] = ' - "' . $expectedFile . '" for any other application'; |
|
| 108 | + $message[] = ' - "'.$expectedFile.'" for any other application'; |
|
| 109 | 109 | } |
| 110 | 110 | $lMax = 0; |
| 111 | 111 | foreach ($message as $line) { |
@@ -113,12 +113,12 @@ discard block |
||
| 113 | 113 | $lMax = $l; |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | - $this->output->writeln('<warning>' . str_repeat(' ', $lMax + 4) . '</warning>'); |
|
| 116 | + $this->output->writeln('<warning>'.str_repeat(' ', $lMax + 4).'</warning>'); |
|
| 117 | 117 | foreach ($message as $line) { |
| 118 | 118 | $line = str_pad($line, $lMax + 2); |
| 119 | 119 | $this->output->writeln("<warning> $line</warning>"); |
| 120 | 120 | } |
| 121 | - $this->output->writeln('<warning>' . str_repeat(' ', $lMax + 4) . '</warning>'); |
|
| 121 | + $this->output->writeln('<warning>'.str_repeat(' ', $lMax + 4).'</warning>'); |
|
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | . "| ' /| | __/ _ \\\n" |
| 136 | 136 | . "| . \\| | |_| __/\n" |
| 137 | 137 | . "|_|\\_|_|\\__\\___|\n\n" |
| 138 | - . $this->getLongVersion() . "\n\n" |
|
| 138 | + . $this->getLongVersion()."\n\n" |
|
| 139 | 139 | . $this->getSelfPackage()->description; |
| 140 | 140 | |
| 141 | 141 | return $help; |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | if (isset($package->source)) { |
| 154 | 154 | $v .= " <comment>({$package->source->reference})</comment>"; |
| 155 | 155 | } |
| 156 | - $v .= ' ' . $package->time; |
|
| 156 | + $v .= ' '.$package->time; |
|
| 157 | 157 | return $v; |
| 158 | 158 | } |
| 159 | 159 | |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | { |
| 167 | 167 | static $package = null; |
| 168 | 168 | if (!$package) { |
| 169 | - $files = [__DIR__ . '/../../../../composer/installed.json', __DIR__ . '/vendor/composer/installed.json']; |
|
| 169 | + $files = [__DIR__.'/../../../../composer/installed.json', __DIR__.'/vendor/composer/installed.json']; |
|
| 170 | 170 | foreach ($files as $file) { |
| 171 | 171 | if (file_exists($file)) { |
| 172 | 172 | $installed = json_decode(file_get_contents($file)); |
@@ -183,9 +183,9 @@ discard block |
||
| 183 | 183 | $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); |
| 184 | 184 | $process->run(); |
| 185 | 185 | if ($output = $process->getOutput()) { |
| 186 | - $package = json_decode(file_get_contents($kitePath . '/composer.json')); |
|
| 186 | + $package = json_decode(file_get_contents($kitePath.'/composer.json')); |
|
| 187 | 187 | list($name, $revision, $tstamp) = explode("\n", trim($output), 3); |
| 188 | - $package->version = preg_match('/^v?[0-9]+\.[0-9]+\.[0-9]+(-[a-z0-9]+)?$/i', $name) ? $name : 'dev-' . $name; |
|
| 188 | + $package->version = preg_match('/^v?[0-9]+\.[0-9]+\.[0-9]+(-[a-z0-9]+)?$/i', $name) ? $name : 'dev-'.$name; |
|
| 189 | 189 | $package->source = (object) ['reference' => $revision]; |
| 190 | 190 | $package->time = date('Y-m-d H:i:s', $tstamp); |
| 191 | 191 | } else { |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | $definition->addOption(new InputOption('workflow', null, InputOption::VALUE_OPTIONAL, 'Run a workflow on the fly')); |
| 208 | 208 | |
| 209 | 209 | if (isset($_SERVER['HOME']) && is_writable($_SERVER['HOME'])) { |
| 210 | - $debugDir = $_SERVER['HOME'] . '/.kite/log'; |
|
| 210 | + $debugDir = $_SERVER['HOME'].'/.kite/log'; |
|
| 211 | 211 | } else { |
| 212 | 212 | $debugDir = false; |
| 213 | 213 | } |
@@ -251,19 +251,19 @@ discard block |
||
| 251 | 251 | $strInput .= ' --help'; |
| 252 | 252 | } |
| 253 | 253 | $workflow = $input->getParameterOption('--workflow'); |
| 254 | - $jobName = 'generic:workflow:' . $workflow; |
|
| 254 | + $jobName = 'generic:workflow:'.$workflow; |
|
| 255 | 255 | $this->config->configureJob($jobName, array('workflow' => $workflow)); |
| 256 | 256 | $command = new JobCommand($jobName, $this->config); |
| 257 | 257 | $this->add($command); |
| 258 | 258 | |
| 259 | - $parameterOption = '--workflow=' . $workflow; |
|
| 259 | + $parameterOption = '--workflow='.$workflow; |
|
| 260 | 260 | $input = new StringInput( |
| 261 | 261 | rtrim( |
| 262 | - $jobName . ' ' . |
|
| 262 | + $jobName.' '. |
|
| 263 | 263 | str_replace( |
| 264 | 264 | array( |
| 265 | - $parameterOption . ' ', |
|
| 266 | - ' ' . $parameterOption, |
|
| 265 | + $parameterOption.' ', |
|
| 266 | + ' '.$parameterOption, |
|
| 267 | 267 | $parameterOption |
| 268 | 268 | ), '', $strInput |
| 269 | 269 | ) |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | /** |
| 29 | 29 | * ConsoleOutput constructor. |
| 30 | 30 | * |
| 31 | - * @param int|mixed $verbosity The verbosity |
|
| 31 | + * @param integer $verbosity The verbosity |
|
| 32 | 32 | * @param boolean $decorated If output should be decorated |
| 33 | 33 | * @param OutputFormatterInterface|null $formatter Formatter |
| 34 | 34 | */ |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | namespace Netresearch\Kite\Service; |
| 16 | 16 | |
| 17 | 17 | use Netresearch\Kite\Console\Output\Output; |
| 18 | - |
|
| 19 | 18 | use Symfony\Component\Console\Application; |
| 20 | 19 | use Symfony\Component\Console\Helper; |
| 21 | 20 | use Symfony\Component\Console\Input\InputInterface; |
@@ -135,7 +135,7 @@ |
||
| 135 | 135 | * @param callable|null $callback A PHP callback to run whenever there is some |
| 136 | 136 | * output available on STDOUT or STDERR |
| 137 | 137 | * |
| 138 | - * @return mixed The output of the shell command or FALSE if the command returned a non-zero exit code and $ignoreErrors was enabled. |
|
| 138 | + * @return null|string The output of the shell command or FALSE if the command returned a non-zero exit code and $ignoreErrors was enabled. |
|
| 139 | 139 | */ |
| 140 | 140 | public function run($callback = NULL) |
| 141 | 141 | { |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | } elseif (is_array($command)) { |
| 67 | 67 | $command = implode('; ', $command); |
| 68 | 68 | } else { |
| 69 | - throw new \Netresearch\Kite\Exception('Command must be string or array, ' . gettype($command) . ' given.', 1312454906); |
|
| 69 | + throw new \Netresearch\Kite\Exception('Command must be string or array, '.gettype($command).' given.', 1312454906); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | parent::__construct($command, $cwd, null, null, null); |
@@ -141,14 +141,14 @@ discard block |
||
| 141 | 141 | { |
| 142 | 142 | $command = $this->getCommandLine(); |
| 143 | 143 | |
| 144 | - $this->console->output('<cmd>' . $this->getWorkingDirectory() . ' > ' . $command . '</cmd>', OutputInterface::VERBOSITY_VERBOSE); |
|
| 144 | + $this->console->output('<cmd>'.$this->getWorkingDirectory().' > '.$command.'</cmd>', OutputInterface::VERBOSITY_VERBOSE); |
|
| 145 | 145 | |
| 146 | 146 | if ($this->dryRun) { |
| 147 | 147 | return null; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | parent::run( |
| 151 | - function ($type, $buffer) use ($callback) { |
|
| 151 | + function($type, $buffer) use ($callback) { |
|
| 152 | 152 | if ($callback) { |
| 153 | 153 | call_user_func($callback, $type, $buffer); |
| 154 | 154 | } |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | namespace Netresearch\Kite\Task; |
| 16 | 16 | |
| 17 | 17 | |
| 18 | -use Netresearch\Kite\Exception; |
|
| 19 | 18 | use Netresearch\Kite\Task; |
| 20 | 19 | |
| 21 | 20 | /** |
@@ -136,7 +136,7 @@ |
||
| 136 | 136 | /** |
| 137 | 137 | * Execute the command |
| 138 | 138 | * |
| 139 | - * @return mixed |
|
| 139 | + * @return null|string |
|
| 140 | 140 | */ |
| 141 | 141 | protected function executeCommand() |
| 142 | 142 | { |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | $process = $this->console->createProcess($this->getCommand(), $this->get('cwd')); |
| 144 | 144 | $process->setDryRun(!$this->shouldExecute()); |
| 145 | 145 | foreach ($this->get('processSettings') as $key => $value) { |
| 146 | - $process->{'set' . ucfirst($key)}($value); |
|
| 146 | + $process->{'set'.ucfirst($key)}($value); |
|
| 147 | 147 | } |
| 148 | 148 | return $process->run(); |
| 149 | 149 | } |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | if ($options || $arguments) { |
| 170 | 170 | throw new Exception('Can not combine argv with options or arguments'); |
| 171 | 171 | } |
| 172 | - $cmd .= ' ' . (is_array($argv) ? implode(' ', $argv) : $argv); |
|
| 172 | + $cmd .= ' '.(is_array($argv) ? implode(' ', $argv) : $argv); |
|
| 173 | 173 | } else { |
| 174 | 174 | $cmd .= $this->renderOptions($options); |
| 175 | 175 | $cmd .= $this->renderArguments($arguments); |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | $argumentString = ''; |
| 225 | 225 | foreach ($arguments as $argument) { |
| 226 | 226 | $value = $this->expand($argument); |
| 227 | - $argumentString .= ' ' . escapeshellarg($value); |
|
| 227 | + $argumentString .= ' '.escapeshellarg($value); |
|
| 228 | 228 | } |
| 229 | 229 | return $argumentString; |
| 230 | 230 | } |
@@ -15,8 +15,6 @@ |
||
| 15 | 15 | namespace Netresearch\Kite\Task; |
| 16 | 16 | use Netresearch\Kite\Task; |
| 17 | 17 | use Netresearch\Kite\Tasks; |
| 18 | -use Netresearch\Kite\Workflow; |
|
| 19 | -use Netresearch\Kite\Exception; |
|
| 20 | 18 | |
| 21 | 19 | /** |
| 22 | 20 | * Run tasks or a workflow within a task |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | /** |
| 427 | 427 | * Execute the next fetched task after given $task |
| 428 | 428 | * |
| 429 | - * @param Task|string $task Task or task name |
|
| 429 | + * @param string $task Task or task name |
|
| 430 | 430 | * |
| 431 | 431 | * @return $this |
| 432 | 432 | */ |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | * @param string $question The question |
| 445 | 445 | * @param string $default The default value |
| 446 | 446 | * |
| 447 | - * @return mixed|\Netresearch\Kite\Task |
|
| 447 | + * @return string |
|
| 448 | 448 | */ |
| 449 | 449 | public function answer($question, $default = null) |
| 450 | 450 | { |
@@ -506,11 +506,11 @@ discard block |
||
| 506 | 506 | * Run a composer command |
| 507 | 507 | * |
| 508 | 508 | * @param string $command The command to execute |
| 509 | - * @param array|string|null $optArg Options and arguments |
|
| 509 | + * @param string $optArg Options and arguments |
|
| 510 | 510 | * {@see \Netresearch\Kite\Task\ShellTask} |
| 511 | 511 | * @param array $processSettings Settings for symfony process class |
| 512 | 512 | * |
| 513 | - * @return string|\Netresearch\Kite\Task\ComposerTask |
|
| 513 | + * @return string |
|
| 514 | 514 | */ |
| 515 | 515 | public function composer($command, $optArg = null, array $processSettings = array()) |
| 516 | 516 | { |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | * {@see \Netresearch\Kite\Task\ShellTask} |
| 567 | 567 | * @param array $processSettings Settings for symfony process class |
| 568 | 568 | * |
| 569 | - * @return Task\GitTask|string |
|
| 569 | + * @return string |
|
| 570 | 570 | */ |
| 571 | 571 | public function git($command, $cwd = null, $optArg = null, array $processSettings = array()) |
| 572 | 572 | { |
@@ -576,7 +576,7 @@ discard block |
||
| 576 | 576 | /** |
| 577 | 577 | * Run a workflow for each of the $array's values. |
| 578 | 578 | * |
| 579 | - * @param array|\Traversable $array The object to iterate over |
|
| 579 | + * @param string $array The object to iterate over |
|
| 580 | 580 | * @param string|array $as Either string for |
| 581 | 581 | * foreach ($array as $as) |
| 582 | 582 | * or array for |
@@ -633,7 +633,7 @@ discard block |
||
| 633 | 633 | * {@see \Netresearch\Kite\Task\ShellTask} |
| 634 | 634 | * @param array $processSettings Settings for symfony process class |
| 635 | 635 | * |
| 636 | - * @return Task\RemoteShellTask|string |
|
| 636 | + * @return string |
|
| 637 | 637 | */ |
| 638 | 638 | public function remoteShell($command, $cwd = null, $optArg = null, array $processSettings = array()) |
| 639 | 639 | { |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | if (!$name) { |
| 284 | 284 | return 0; |
| 285 | 285 | } |
| 286 | - $key = $type . ':' . $name; |
|
| 286 | + $key = $type.':'.$name; |
|
| 287 | 287 | $tasksAdded = 0; |
| 288 | 288 | if (array_key_exists($key, $this->job->deferredTasks)) { |
| 289 | 289 | while ($task = array_shift($this->job->deferredTasks[$key])) { |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | $shouldRun = $if; |
| 311 | 311 | } elseif (is_string($if)) { |
| 312 | 312 | $shouldRun = (boolean) $task->expand( |
| 313 | - '{' . $if . ' ? 1 : 0}' |
|
| 313 | + '{'.$if.' ? 1 : 0}' |
|
| 314 | 314 | ); |
| 315 | 315 | } else { |
| 316 | 316 | $shouldRun = call_user_func_array($if, array($task, $this->console)); |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | if ($name === '@self') { |
| 350 | 350 | $name = $this->get('name'); |
| 351 | 351 | } |
| 352 | - $key = $type . ':' . $name; |
|
| 352 | + $key = $type.':'.$name; |
|
| 353 | 353 | $this->job->deferredTasks[$key][] = $task; |
| 354 | 354 | } |
| 355 | 355 | } |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | |
| 15 | 15 | namespace Netresearch\Kite\Workflow\Composer; |
| 16 | 16 | use Netresearch\Kite\Service\Composer\Package; |
| 17 | -use Netresearch\Kite\Task; |
|
| 18 | 17 | use Netresearch\Kite\Workflow; |
| 19 | 18 | |
| 20 | 19 | |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | public function assemble() |
| 78 | 78 | { |
| 79 | 79 | $this->callback( |
| 80 | - function () { |
|
| 80 | + function() { |
|
| 81 | 81 | $mergeBranch = $this->get('branch'); |
| 82 | 82 | $diagnose = !$this->get('no-diagnose'); |
| 83 | 83 | $delete = $this->get('delete', false); |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | |
| 101 | 101 | if ($delete) { |
| 102 | 102 | $this->git('branch', $package->path, array('d' => $mergeBranch)); |
| 103 | - $this->git('push', $package->path, array('origin', ':' . $mergeBranch)); |
|
| 103 | + $this->git('push', $package->path, array('origin', ':'.$mergeBranch)); |
|
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | |
@@ -142,10 +142,10 @@ discard block |
||
| 142 | 142 | $package->branches[] = $checkoutBranch; |
| 143 | 143 | $inferFromBranch = 'master'; |
| 144 | 144 | } |
| 145 | - $this->git('fetch', $package->path, array('force' => true, 'origin', $inferFromBranch . ':' . $checkoutBranch)); |
|
| 145 | + $this->git('fetch', $package->path, array('force' => true, 'origin', $inferFromBranch.':'.$checkoutBranch)); |
|
| 146 | 146 | $this->git('checkout', $package->path, array($checkoutBranch)); |
| 147 | 147 | $package->branch = $checkoutBranch; |
| 148 | - $package->version = 'dev-' . $checkoutBranch; |
|
| 148 | + $package->version = 'dev-'.$checkoutBranch; |
|
| 149 | 149 | } else { |
| 150 | 150 | continue; |
| 151 | 151 | } |