@@ -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 | } |
@@ -14,10 +14,7 @@ |
||
14 | 14 | |
15 | 15 | namespace Netresearch\Kite\Workflow; |
16 | 16 | use Netresearch\Kite\Task; |
17 | - |
|
18 | 17 | use Netresearch\Kite\Workflow; |
19 | -use Netresearch\Kite\Exception; |
|
20 | - |
|
21 | 18 | use Symfony\Component\Console\Input\InputOption; |
22 | 19 | |
23 | 20 | /** |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | if (!$rollback && !$restore) { |
89 | 89 | $this->checkout(); |
90 | 90 | $this->release = date($this->get('releaseFormat', 'YmdHis')); |
91 | - $this->set('releaseDir', 'releases/' . $this->release); |
|
91 | + $this->set('releaseDir', 'releases/'.$this->release); |
|
92 | 92 | $this->release(); |
93 | 93 | $this->shareResources(); |
94 | 94 | } |
@@ -195,9 +195,9 @@ discard block |
||
195 | 195 | protected function activate() |
196 | 196 | { |
197 | 197 | $sub = $this->iterate('{nodes}', 'node'); |
198 | - $sub->message('<step>Activating ' . ($this->release ? 'new' : 'latest') . ' release</step>'); |
|
198 | + $sub->message('<step>Activating '.($this->release ? 'new' : 'latest').' release</step>'); |
|
199 | 199 | $sub->callback( |
200 | - function (Task\IterateTask $iterator) { |
|
200 | + function(Task\IterateTask $iterator) { |
|
201 | 201 | $links = $iterator->remoteShell('echo "`readlink previous`;`readlink current`;`readlink next`"', '{node.deployPath}'); |
202 | 202 | list($previous, $current, $next) = explode(';', $links); |
203 | 203 | |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | |
214 | 214 | $commands = array("ln -sfn $next current; rm next"); |
215 | 215 | if ($current) { |
216 | - $from = '<comment>' . basename($current) . '</comment>'; |
|
216 | + $from = '<comment>'.basename($current).'</comment>'; |
|
217 | 217 | array_unshift($commands, "ln -s $current previous"); |
218 | 218 | if ($previous) { |
219 | 219 | array_unshift($commands, "rm previous; rm -rf $previous"); |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | $sub = $this->iterate('{nodes}', 'node'); |
253 | 253 | $sub->message('<step>Restoring previous release</step>'); |
254 | 254 | $sub->callback( |
255 | - function (Task\IterateTask $iterator) use (&$firstPreviousRelease) { |
|
255 | + function(Task\IterateTask $iterator) use (&$firstPreviousRelease) { |
|
256 | 256 | $links = $iterator->remoteShell('echo "`readlink previous`;`readlink current`;`readlink next`"', '{node.deployPath}'); |
257 | 257 | list($previous, $current, $next) = explode(';', $links); |
258 | 258 | if (!$previous) { |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | $commands = array("ln -sfn $previous current; rm previous"); |
270 | 270 | if ($current) { |
271 | 271 | array_unshift($commands, "ln -s $current next"); |
272 | - $from = '<comment>' . basename($current) . '</comment>'; |
|
272 | + $from = '<comment>'.basename($current).'</comment>'; |
|
273 | 273 | } else { |
274 | 274 | $from = '<warning>none</warning>'; |
275 | 275 | } |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | $sub = $this->iterate('{shared}', array('type' => 'entries')); |
293 | 293 | $sub->message('<step>Linking shared resources</step>'); |
294 | 294 | $sub->callback( |
295 | - function (Task\IterateTask $iterator) { |
|
295 | + function(Task\IterateTask $iterator) { |
|
296 | 296 | $type = $iterator->get('type'); |
297 | 297 | if (!in_array($type, array('dirs', 'files'), true)) { |
298 | 298 | $iterator->doExit('shared may only contain keys "dirs" or "files"', 1); |
@@ -311,13 +311,13 @@ discard block |
||
311 | 311 | } |
312 | 312 | |
313 | 313 | $commands[] = 'cd {releaseDir}'; |
314 | - $commands[] = 'rm -rf ' . $entry; |
|
314 | + $commands[] = 'rm -rf '.$entry; |
|
315 | 315 | if ($dirName) { |
316 | - $commands[] = 'mkdir -p ' . $dirName; |
|
317 | - $commands[] = 'cd ' . $dirName; |
|
316 | + $commands[] = 'mkdir -p '.$dirName; |
|
317 | + $commands[] = 'cd '.$dirName; |
|
318 | 318 | $subDirCount += substr_count($dirName, '/') + 1; |
319 | 319 | } |
320 | - $commands[] = 'ln -s ' . str_repeat('../', $subDirCount) . $shareDir . '/' . $entry; |
|
320 | + $commands[] = 'ln -s '.str_repeat('../', $subDirCount).$shareDir.'/'.$entry; |
|
321 | 321 | |
322 | 322 | $iterator->remoteShell($commands, '{node.deployPath}'); |
323 | 323 | } |
@@ -13,12 +13,9 @@ |
||
13 | 13 | */ |
14 | 14 | |
15 | 15 | namespace Netresearch\Kite\Workflow; |
16 | -use Netresearch\Kite\Service\Factory; |
|
17 | 16 | use Netresearch\Kite\Task; |
18 | - |
|
19 | 17 | use Netresearch\Kite\Workflow; |
20 | 18 | use Netresearch\Kite\Exception; |
21 | - |
|
22 | 19 | use Symfony\Component\Console\Output\OutputInterface; |
23 | 20 | |
24 | 21 | /** |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | public function assemble() |
132 | 132 | { |
133 | 133 | $this->callback( |
134 | - function () { |
|
134 | + function() { |
|
135 | 135 | $stages = $this->get('stages'); |
136 | 136 | $stageOptions = array(); |
137 | 137 | // Begin keys from 1 |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | $task = clone $this->task; |
177 | 177 | foreach ($stages[$stage] as $key => $value) { |
178 | 178 | // Avoid variables overriding parent variables, by prefixing with this |
179 | - $task->set('this.' . $key, $value); |
|
179 | + $task->set('this.'.$key, $value); |
|
180 | 180 | } |
181 | 181 | $this->addTask($task); |
182 | 182 | } |
@@ -49,7 +49,7 @@ |
||
49 | 49 | ], |
50 | 50 | 'task' => [ |
51 | 51 | 'type' => 'callback', |
52 | - 'callback' => function (\Netresearch\Kite\Job $job) { |
|
52 | + 'callback' => function(\Netresearch\Kite\Job $job) { |
|
53 | 53 | $git = $job->get('git'); |
54 | 54 | $command = $job->get('cmd'); |
55 | 55 | foreach ($job->get('composer.packages') as $package) { |
@@ -172,10 +172,10 @@ |
||
172 | 172 | } |
173 | 173 | if ($isTest) { |
174 | 174 | if ($isFunctionCall) { |
175 | - throw new SyntaxError('Can\'t use function return value in write context', $stream->current->cursor); |
|
175 | + throw new SyntaxError('Can\'t use function return value in write context', $stream->current->cursor); |
|
176 | 176 | } |
177 | 177 | if (!$stream->current->test(Token::PUNCTUATION_TYPE, ')')) { |
178 | - throw new SyntaxError('Expected )', $stream->current->cursor); |
|
178 | + throw new SyntaxError('Expected )', $stream->current->cursor); |
|
179 | 179 | } |
180 | 180 | $tokens[] = new Token(Token::STRING_TYPE, implode('.', $names), $token->cursor); |
181 | 181 | } else { |
@@ -51,7 +51,7 @@ |
||
51 | 51 | public function execute() |
52 | 52 | { |
53 | 53 | ob_start( |
54 | - function ($output) { |
|
54 | + function($output) { |
|
55 | 55 | $this->console->output($output, false); |
56 | 56 | return ''; |
57 | 57 | }, 2, 0 |
@@ -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; |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | . "from kite configuration:\n\n" |
145 | 145 | . $this->getHelper('formatter')->formatBlock($this->getDescription(), 'fg=black;bg=green', true) |
146 | 146 | . "\n\nThe canonicalized command is:\n\n" |
147 | - . " <info>php " . $_SERVER['PHP_SELF'] . ' ' . preg_replace('/^generic:([^:]+):([^ ]+)/', '--$1=$2', $this->getName()) . "</info>\n"; |
|
147 | + . " <info>php ".$_SERVER['PHP_SELF'].' '.preg_replace('/^generic:([^:]+):([^ ]+)/', '--$1=$2', $this->getName())."</info>\n"; |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
@@ -178,13 +178,13 @@ discard block |
||
178 | 178 | if (!$input->getOption('no-debug-file') && $debugDir = $input->getOption('debug-dir')) { |
179 | 179 | $this->console->getFilesystem()->ensureDirectoryExists($debugDir); |
180 | 180 | // keep max 20 logs |
181 | - $files = glob($debugDir . '/*'); |
|
181 | + $files = glob($debugDir.'/*'); |
|
182 | 182 | while (count($files) > 19) { |
183 | 183 | $this->console->getFilesystem()->remove(array_shift($files)); |
184 | 184 | } |
185 | 185 | $logFile = date('YmdHis'); |
186 | 186 | $debugOutput = new Output( |
187 | - fopen(rtrim($debugDir, '\\/') . '/' . $logFile, 'w'), |
|
187 | + fopen(rtrim($debugDir, '\\/').'/'.$logFile, 'w'), |
|
188 | 188 | Output::VERBOSITY_VERY_VERBOSE, |
189 | 189 | true |
190 | 190 | ); |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | $debugOutput->writeln( |
194 | 194 | $this->getHelper('formatter')->formatBlock( |
195 | 195 | implode(' ', $_SERVER['argv']), 'fg=black;bg=white', true |
196 | - ) . "\n" |
|
196 | + )."\n" |
|
197 | 197 | ); |
198 | 198 | } |
199 | 199 | } |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | } catch (\Exception $e) { |
224 | 224 | if ($e instanceof ExitException && $e->getCode() === 0) { |
225 | 225 | if ($e->getMessage()) { |
226 | - $output->writeln('<info>' . $e->getMessage() . '</info>'); |
|
226 | + $output->writeln('<info>'.$e->getMessage().'</info>'); |
|
227 | 227 | } |
228 | 228 | return 0; |
229 | 229 | } |
@@ -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; |
@@ -149,10 +149,10 @@ |
||
149 | 149 | $newline = true; |
150 | 150 | } |
151 | 151 | if ($this->previousWasNewLine && $l >= 0 && $message[0] !== "\n") { |
152 | - $message = $this->getIndention() . $message; |
|
152 | + $message = $this->getIndention().$message; |
|
153 | 153 | } |
154 | 154 | if (strpos($message, "\n") !== false) { |
155 | - $message = str_replace("\n", "\n" . $this->getIndention(), $message); |
|
155 | + $message = str_replace("\n", "\n".$this->getIndention(), $message); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | // TODO: Indent wrapped lines - that's just not that easy because of the ANSI color escape codes |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | /** |
53 | 53 | * Constructor. |
54 | 54 | * |
55 | - * @param mixed $stream A stream resource |
|
55 | + * @param resource $stream A stream resource |
|
56 | 56 | * @param int $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface) |
57 | 57 | * @param bool|null $decorated Whether to decorate messages (null for auto-guessing) |
58 | 58 | * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter) |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | /** |
131 | 131 | * Write to output |
132 | 132 | * |
133 | - * @param array|string $messages Messages |
|
133 | + * @param string $messages Messages |
|
134 | 134 | * @param bool $newline Whether to append a newline |
135 | 135 | * @param int $type The output type |
136 | 136 | * |
@@ -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 |