@@ -12,8 +12,6 @@ |
||
12 | 12 | */ |
13 | 13 | |
14 | 14 | namespace Netresearch\Kite\Workflow\Composer; |
15 | -use Netresearch\Kite\Exception; |
|
16 | - |
|
17 | 15 | use Netresearch\Kite\Workflow; |
18 | 16 | |
19 | 17 | /** |
@@ -189,25 +189,25 @@ discard block |
||
189 | 189 | ) |
190 | 190 | ); |
191 | 191 | switch ($fix) { |
192 | - case 1: |
|
193 | - $this->git('add', $package->path, array('N' => true, 'A' => true)); |
|
194 | - $this->console->output(''); |
|
195 | - $this->git('diff', $package->path, 'HEAD', array('tty' => true)); |
|
196 | - $this->console->output(''); |
|
197 | - $this->fixUnstagedChanges($package); |
|
198 | - break; |
|
199 | - case 2: |
|
200 | - $this->git('reset', $package->path, array('hard' => true)); |
|
201 | - $this->git('clean', $package->path, array('i' => true, 'd' => true), array('tty' => true)); |
|
202 | - break; |
|
203 | - case 3: |
|
204 | - $this->git('reset', $package->path); |
|
205 | - $args = 'save -u'; |
|
206 | - if ($message = $this->answer('Message for stash:')) { |
|
207 | - $args .= ' ' . escapeshellarg($message); |
|
208 | - } |
|
209 | - $this->git('stash', $package->path, $args); |
|
210 | - break; |
|
192 | + case 1: |
|
193 | + $this->git('add', $package->path, array('N' => true, 'A' => true)); |
|
194 | + $this->console->output(''); |
|
195 | + $this->git('diff', $package->path, 'HEAD', array('tty' => true)); |
|
196 | + $this->console->output(''); |
|
197 | + $this->fixUnstagedChanges($package); |
|
198 | + break; |
|
199 | + case 2: |
|
200 | + $this->git('reset', $package->path, array('hard' => true)); |
|
201 | + $this->git('clean', $package->path, array('i' => true, 'd' => true), array('tty' => true)); |
|
202 | + break; |
|
203 | + case 3: |
|
204 | + $this->git('reset', $package->path); |
|
205 | + $args = 'save -u'; |
|
206 | + if ($message = $this->answer('Message for stash:')) { |
|
207 | + $args .= ' ' . escapeshellarg($message); |
|
208 | + } |
|
209 | + $this->git('stash', $package->path, $args); |
|
210 | + break; |
|
211 | 211 | } |
212 | 212 | } |
213 | 213 | |
@@ -265,24 +265,24 @@ discard block |
||
265 | 265 | $fixes[3] = 'Push with <comment>--force</comment>'; |
266 | 266 | } |
267 | 267 | switch ($this->selectFixes($fixes)) { |
268 | - case 1: |
|
269 | - $this->gitRevDiff($package, '@\{u\}', 'Remote', 'Local'); |
|
270 | - $this->fixRemoteSynchronicity($package); |
|
271 | - break; |
|
272 | - case 3: |
|
273 | - $commands = array('push'); |
|
274 | - $options = '--force'; |
|
275 | - case 2: |
|
276 | - foreach ($commands as $command) { |
|
277 | - $pck = "<comment>{$package->name}</comment>"; |
|
278 | - $this->console->output($msg = ucfirst($command) . "ing $pck...", false); |
|
279 | - $this->git($command, $package->path, isset($options) ? $options : null); |
|
280 | - $this->console->output( |
|
281 | - str_repeat(chr(8), strlen(strip_tags($msg))) |
|
282 | - . "<fg=green>Sucessfully {$command}ed $pck</>" |
|
283 | - ); |
|
284 | - } |
|
285 | - break; |
|
268 | + case 1: |
|
269 | + $this->gitRevDiff($package, '@\{u\}', 'Remote', 'Local'); |
|
270 | + $this->fixRemoteSynchronicity($package); |
|
271 | + break; |
|
272 | + case 3: |
|
273 | + $commands = array('push'); |
|
274 | + $options = '--force'; |
|
275 | + case 2: |
|
276 | + foreach ($commands as $command) { |
|
277 | + $pck = "<comment>{$package->name}</comment>"; |
|
278 | + $this->console->output($msg = ucfirst($command) . "ing $pck...", false); |
|
279 | + $this->git($command, $package->path, isset($options) ? $options : null); |
|
280 | + $this->console->output( |
|
281 | + str_repeat(chr(8), strlen(strip_tags($msg))) |
|
282 | + . "<fg=green>Sucessfully {$command}ed $pck</>" |
|
283 | + ); |
|
284 | + } |
|
285 | + break; |
|
286 | 286 | } |
287 | 287 | } |
288 | 288 | |
@@ -371,19 +371,19 @@ discard block |
||
371 | 371 | } |
372 | 372 | } |
373 | 373 | switch ($this->selectFixes($actions)) { |
374 | - case 1: |
|
375 | - $this->gitRevDiff($package, $package->requiredBranch, $requiredConstraint, $currentConstraint); |
|
376 | - $this->fixRequirementsMatch($package); |
|
377 | - break; |
|
378 | - case 2: |
|
379 | - $this->checkoutPackage($package, $package->requiredBranch); |
|
380 | - $this->reloadRequires($package); |
|
381 | - break; |
|
382 | - case 3: |
|
383 | - foreach ($package->unsatisfiedDependentPackages as $dependentPackage) { |
|
384 | - $this->rewriteRequirement($dependentPackage, $package->name, $currentConstraint); |
|
385 | - } |
|
386 | - break; |
|
374 | + case 1: |
|
375 | + $this->gitRevDiff($package, $package->requiredBranch, $requiredConstraint, $currentConstraint); |
|
376 | + $this->fixRequirementsMatch($package); |
|
377 | + break; |
|
378 | + case 2: |
|
379 | + $this->checkoutPackage($package, $package->requiredBranch); |
|
380 | + $this->reloadRequires($package); |
|
381 | + break; |
|
382 | + case 3: |
|
383 | + foreach ($package->unsatisfiedDependentPackages as $dependentPackage) { |
|
384 | + $this->rewriteRequirement($dependentPackage, $package->name, $currentConstraint); |
|
385 | + } |
|
386 | + break; |
|
387 | 387 | } |
388 | 388 | } |
389 | 389 | |
@@ -438,17 +438,17 @@ discard block |
||
438 | 438 | ); |
439 | 439 | |
440 | 440 | switch ($fix) { |
441 | - case 1: |
|
442 | - $this->gitRevDiff($package, $package->source->reference, 'Locked', 'Current'); |
|
443 | - $this->fixDivergeFromLock($package); |
|
444 | - break; |
|
445 | - case 2: |
|
446 | - $this->composerUpdateRequired = true; |
|
447 | - break; |
|
448 | - case 3: |
|
449 | - $this->git('checkout', $package->path, $package->source->reference); |
|
450 | - $this->reloadRequires($package); |
|
451 | - break; |
|
441 | + case 1: |
|
442 | + $this->gitRevDiff($package, $package->source->reference, 'Locked', 'Current'); |
|
443 | + $this->fixDivergeFromLock($package); |
|
444 | + break; |
|
445 | + case 2: |
|
446 | + $this->composerUpdateRequired = true; |
|
447 | + break; |
|
448 | + case 3: |
|
449 | + $this->git('checkout', $package->path, $package->source->reference); |
|
450 | + $this->reloadRequires($package); |
|
451 | + break; |
|
452 | 452 | } |
453 | 453 | } |
454 | 454 |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | if (substr($method, 0, 5) === 'check' && $method[5] === strtoupper($method[5])) { |
59 | 59 | $check = substr($method, 5); |
60 | 60 | $this->checks[] = $check; |
61 | - if (method_exists($this, 'fix' . $check)) { |
|
61 | + if (method_exists($this, 'fix'.$check)) { |
|
62 | 62 | $this->fixes[] = $check; |
63 | 63 | } |
64 | 64 | } |
@@ -68,12 +68,12 @@ discard block |
||
68 | 68 | 'check' => array( |
69 | 69 | 'type' => 'array', |
70 | 70 | 'option' => true, |
71 | - 'label' => 'Only execute these checks - available checks are ' . implode(', ', $this->checks), |
|
71 | + 'label' => 'Only execute these checks - available checks are '.implode(', ', $this->checks), |
|
72 | 72 | ), |
73 | 73 | 'fix' => array( |
74 | 74 | 'type' => 'boolean|array', |
75 | 75 | 'option' => true, |
76 | - 'label' => 'Enable fixes and optionally reduce to certain fixes - available fixes are ' . implode(', ', $this->fixes), |
|
76 | + 'label' => 'Enable fixes and optionally reduce to certain fixes - available fixes are '.implode(', ', $this->fixes), |
|
77 | 77 | ), |
78 | 78 | ) + parent::configureVariables(); |
79 | 79 | } |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | public function assemble() |
87 | 87 | { |
88 | 88 | $this->callback( |
89 | - function () { |
|
89 | + function() { |
|
90 | 90 | $fix = $this->get('fix'); |
91 | 91 | $fixes = ($fix === true) ? $this->fixes : (array) $fix; |
92 | 92 | $checks = $this->get('check') ?: $this->checks; |
@@ -120,11 +120,11 @@ discard block |
||
120 | 120 | if ($packageNames && !in_array($package->name, $packageNames, true)) { |
121 | 121 | continue; |
122 | 122 | } |
123 | - if (is_string($message = $this->{'check' . $check}($package))) { |
|
123 | + if (is_string($message = $this->{'check'.$check}($package))) { |
|
124 | 124 | if (!$packageNames && !$errors) { |
125 | 125 | $this->console->output( |
126 | 126 | str_repeat(chr(8), strlen($check)) |
127 | - . '<fg=red;bg=black>' . $check . '</>' |
|
127 | + . '<fg=red;bg=black>'.$check.'</>' |
|
128 | 128 | ); |
129 | 129 | } |
130 | 130 | $message = sprintf($message, "package <comment>$package->name</>"); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | if ($fix) { |
134 | 134 | $this->dontCheckCurrentPackageAgain = false; |
135 | 135 | $this->console->indent(); |
136 | - $this->{'fix' . $check}($package); |
|
136 | + $this->{'fix'.$check}($package); |
|
137 | 137 | $this->console->outdent(); |
138 | 138 | if (!$this->dontCheckCurrentPackageAgain) { |
139 | 139 | $rerunForPackages[] = $package->name; |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | if (!$errors) { |
156 | 156 | $this->console->output( |
157 | 157 | str_repeat(chr(8), strlen($check)) |
158 | - . '<fg=green;bg=black>' . $check . '</>' |
|
158 | + . '<fg=green;bg=black>'.$check.'</>' |
|
159 | 159 | ); |
160 | 160 | } |
161 | 161 | $this->console->outdent(); |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | $this->git('reset', $package->path); |
213 | 213 | $args = 'save -u'; |
214 | 214 | if ($message = $this->answer('Message for stash:')) { |
215 | - $args .= ' ' . escapeshellarg($message); |
|
215 | + $args .= ' '.escapeshellarg($message); |
|
216 | 216 | } |
217 | 217 | $this->git('stash', $package->path, $args); |
218 | 218 | break; |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | case 2: |
284 | 284 | foreach ($commands as $command) { |
285 | 285 | $pck = "<comment>{$package->name}</comment>"; |
286 | - $this->console->output($msg = ucfirst($command) . "ing $pck...", false); |
|
286 | + $this->console->output($msg = ucfirst($command)."ing $pck...", false); |
|
287 | 287 | $this->git($command, $package->path, isset($options) ? $options : null); |
288 | 288 | $this->console->output( |
289 | 289 | str_repeat(chr(8), strlen(strip_tags($msg))) |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | } |
333 | 333 | } |
334 | 334 | } |
335 | - $constraint = $package->tag ?: 'dev-' . $package->branch; |
|
335 | + $constraint = $package->tag ?: 'dev-'.$package->branch; |
|
336 | 336 | if ($package->requiredBranch && $package->requiredBranch !== $package->branch) { |
337 | 337 | return "%s is at <comment>$constraint</comment> but is required at <comment>dev-{$package->requiredBranch}</comment>"; |
338 | 338 | } |
@@ -353,8 +353,8 @@ discard block |
||
353 | 353 | if ($package->invalidRequirements) { |
354 | 354 | $this->doExit('Can not fix that', 1); |
355 | 355 | } |
356 | - $currentConstraint = $package->tag ?: 'dev-' . $package->branch; |
|
357 | - $requiredConstraint = 'dev-' . $package->requiredBranch; |
|
356 | + $currentConstraint = $package->tag ?: 'dev-'.$package->branch; |
|
357 | + $requiredConstraint = 'dev-'.$package->requiredBranch; |
|
358 | 358 | if ($package->requiredBranch) { |
359 | 359 | $actions = array( |
360 | 360 | 1 => "Show divergent commits between <comment>$currentConstraint</comment> and <comment>$requiredConstraint</comment> (and ask again)", |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | protected function checkDivergeFromLock($package) |
406 | 406 | { |
407 | 407 | if ($package->git && !$package->isRoot) { |
408 | - $constraint = $package->tag ? ltrim($package->tag, 'v') : 'dev-' . $package->branch; |
|
408 | + $constraint = $package->tag ? ltrim($package->tag, 'v') : 'dev-'.$package->branch; |
|
409 | 409 | if (($package->tag || $package->branch) && $package->version !== $constraint) { |
410 | 410 | if ($this->git('rev-parse', $package->path, 'HEAD') === $package->source->reference) { |
411 | 411 | // HEAD is tip of branch and tag - so only branch was detected |
@@ -418,9 +418,9 @@ discard block |
||
418 | 418 | if ($counts[0] || $counts[1]) { |
419 | 419 | $num = $counts[0] ?: $counts[1]; |
420 | 420 | $type = $counts[0] ? 'behind</>' : 'ahead</> of'; |
421 | - return '%s is <comment>' . $num . ' commit' . ($num > 1 ? 's ' : ' ') |
|
422 | - . $type . ' locked commit <comment>' |
|
423 | - . substr($package->source->reference, 0, 7) . '</>'; |
|
421 | + return '%s is <comment>'.$num.' commit'.($num > 1 ? 's ' : ' ') |
|
422 | + . $type.' locked commit <comment>' |
|
423 | + . substr($package->source->reference, 0, 7).'</>'; |
|
424 | 424 | } |
425 | 425 | } |
426 | 426 | return null; |
@@ -538,12 +538,12 @@ discard block |
||
538 | 538 | $side = $i ? 'left' : 'right'; |
539 | 539 | $otherSide = $i ? 'right' : 'left'; |
540 | 540 | $args = "--$side-only --cherry-pick --pretty=format:'%C(yellow)%h %Cgreen%cd %an%Creset%n %s' --abbrev-commit --date=local "; |
541 | - $args .= $ref . '...'; |
|
541 | + $args .= $ref.'...'; |
|
542 | 542 | $log = $this->git('log', $package->path, $args, array('shy' => true)); |
543 | 543 | if ($log) { |
544 | 544 | $this->console->output(''); |
545 | 545 | |
546 | - $title = "<info>{${$side . 'Title'}}</info> > <info>{${$otherSide . 'Title'}}</info>"; |
|
546 | + $title = "<info>{${$side.'Title'}}</info> > <info>{${$otherSide.'Title'}}</info>"; |
|
547 | 547 | $this->output($title); |
548 | 548 | $this->console->output(str_repeat('-', strlen(strip_tags($title)))); |
549 | 549 |
@@ -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) { |
@@ -81,66 +81,66 @@ |
||
81 | 81 | parent::registerFunctions(); |
82 | 82 | $this->register( |
83 | 83 | 'confirm', |
84 | - function ($question) { |
|
84 | + function($question) { |
|
85 | 85 | }, |
86 | - function (array $values, $question) { |
|
86 | + function(array $values, $question) { |
|
87 | 87 | return $this->ask($values[self::VARIABLES_KEY], new ConfirmationQuestion("<question>$question</question> [y] ")); |
88 | 88 | } |
89 | 89 | ); |
90 | 90 | $this->register( |
91 | 91 | 'answer', |
92 | - function ($question) { |
|
92 | + function($question) { |
|
93 | 93 | }, |
94 | - function (array $values, $question) { |
|
94 | + function(array $values, $question) { |
|
95 | 95 | return $this->ask($values[self::VARIABLES_KEY], new Question("<question>$question</question> ")); |
96 | 96 | } |
97 | 97 | ); |
98 | 98 | $this->register( |
99 | 99 | 'choose', |
100 | - function ($question) { |
|
100 | + function($question) { |
|
101 | 101 | }, |
102 | - function (array $values, $question, array $choices) { |
|
102 | + function(array $values, $question, array $choices) { |
|
103 | 103 | return $this->ask($values[self::VARIABLES_KEY], new ChoiceQuestion("<question>$question</question> ", $choices)); |
104 | 104 | } |
105 | 105 | ); |
106 | 106 | $this->register( |
107 | 107 | 'isset', |
108 | - function ($var) { |
|
108 | + function($var) { |
|
109 | 109 | }, |
110 | - function (array $values, $var) { |
|
110 | + function(array $values, $var) { |
|
111 | 111 | return $values[self::VARIABLES_KEY]->has($var); |
112 | 112 | } |
113 | 113 | ); |
114 | 114 | $this->register( |
115 | 115 | 'empty', |
116 | - function ($var) { |
|
116 | + function($var) { |
|
117 | 117 | }, |
118 | - function (array $values, $var) { |
|
118 | + function(array $values, $var) { |
|
119 | 119 | return $values[self::VARIABLES_KEY]->has($var) && $values[self::VARIABLES_KEY]->get($var); |
120 | 120 | } |
121 | 121 | ); |
122 | 122 | $this->register( |
123 | 123 | 'get', |
124 | - function () { |
|
124 | + function() { |
|
125 | 125 | }, |
126 | - function (array $values, $var) { |
|
126 | + function(array $values, $var) { |
|
127 | 127 | return $values[self::VARIABLES_KEY]->get($var); |
128 | 128 | } |
129 | 129 | ); |
130 | 130 | $this->register( |
131 | 131 | 'set', |
132 | - function () { |
|
132 | + function() { |
|
133 | 133 | }, |
134 | - function (array $values, $var, $value) { |
|
134 | + function(array $values, $var, $value) { |
|
135 | 135 | $values[self::VARIABLES_KEY]->set($var, $value); |
136 | 136 | return $value; |
137 | 137 | } |
138 | 138 | ); |
139 | 139 | $this->register( |
140 | 140 | 'replace', |
141 | - function () { |
|
141 | + function() { |
|
142 | 142 | }, |
143 | - function (array $values, $search, $replace, $subject, $regex = false) { |
|
143 | + function(array $values, $search, $replace, $subject, $regex = false) { |
|
144 | 144 | if ($regex) { |
145 | 145 | return preg_replace($search, $replace, $subject); |
146 | 146 | } else { |
@@ -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; |
@@ -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 | } |