@@ -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; |
@@ -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))) |
@@ -330,8 +330,8 @@ discard block |
||
330 | 330 | } |
331 | 331 | if ($package->requiredBranch && $package->requiredBranch !== $requiredBranch) { |
332 | 332 | $package->invalidRequirements = true; |
333 | - return '<error>' . array_pop($dependentPackages) |
|
334 | - . ' and ' . array_pop($dependentPackages) |
|
333 | + return '<error>'.array_pop($dependentPackages) |
|
334 | + . ' and '.array_pop($dependentPackages) |
|
335 | 335 | . ' require %s in different branches</error>'; |
336 | 336 | } |
337 | 337 | $package->requiredBranch = $requiredBranch; |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | } |
344 | 344 | } |
345 | 345 | } |
346 | - $constraint = $package->tag ?: 'dev-' . $package->branch; |
|
346 | + $constraint = $package->tag ?: 'dev-'.$package->branch; |
|
347 | 347 | if ($package->requiredBranch && $package->requiredBranch !== $package->branch) { |
348 | 348 | return "%s is at <comment>$constraint</comment> but is required at <comment>dev-{$package->requiredBranch}</comment>"; |
349 | 349 | } |
@@ -367,8 +367,8 @@ discard block |
||
367 | 367 | if ($package->invalidRequirements) { |
368 | 368 | $this->doExit('Can not fix that', 1); |
369 | 369 | } |
370 | - $currentConstraint = $package->tag ?: 'dev-' . $package->branch; |
|
371 | - $requiredConstraint = 'dev-' . $package->requiredBranch; |
|
370 | + $currentConstraint = $package->tag ?: 'dev-'.$package->branch; |
|
371 | + $requiredConstraint = 'dev-'.$package->requiredBranch; |
|
372 | 372 | if ($package->requiredBranch) { |
373 | 373 | $actions = array( |
374 | 374 | 1 => "Show divergent commits between <comment>$currentConstraint</comment> and <comment>$requiredConstraint</comment> (and ask again)", |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | if ($package->git && !$package->isRoot) { |
422 | 422 | $remote = false; |
423 | 423 | do { |
424 | - $reference = ($remote ? 'origin/' : '') . $package->source->reference; |
|
424 | + $reference = ($remote ? 'origin/' : '').$package->source->reference; |
|
425 | 425 | try { |
426 | 426 | $rawCounts = $this->git('rev-list', $package->path, "--count --left-right --cherry-pick {$reference}..."); |
427 | 427 | break; |
@@ -436,9 +436,9 @@ discard block |
||
436 | 436 | if ($counts[0] || $counts[1]) { |
437 | 437 | $num = $counts[0] ?: $counts[1]; |
438 | 438 | $type = $counts[0] ? 'behind</>' : 'ahead</> of'; |
439 | - return '%s is <comment>' . $num . ' commit' . ($num > 1 ? 's ' : ' ') |
|
440 | - . $type . ' locked commit <comment>' |
|
441 | - . substr($package->source->reference, 0, 7) . '</>'; |
|
439 | + return '%s is <comment>'.$num.' commit'.($num > 1 ? 's ' : ' ') |
|
440 | + . $type.' locked commit <comment>' |
|
441 | + . substr($package->source->reference, 0, 7).'</>'; |
|
442 | 442 | } |
443 | 443 | } |
444 | 444 | return null; |
@@ -556,12 +556,12 @@ discard block |
||
556 | 556 | $side = $i ? 'left' : 'right'; |
557 | 557 | $otherSide = $i ? 'right' : 'left'; |
558 | 558 | $args = "--$side-only --cherry-pick --pretty=format:'%C(yellow)%h %Cgreen%cd %an%Creset%n %s' --abbrev-commit --date=local "; |
559 | - $args .= $ref . '...'; |
|
559 | + $args .= $ref.'...'; |
|
560 | 560 | $log = $this->git('log', $package->path, $args, array('shy' => true)); |
561 | 561 | if ($log) { |
562 | 562 | $this->console->output(''); |
563 | 563 | |
564 | - $title = "<info>{${$side . 'Title'}}</info> > <info>{${$otherSide . 'Title'}}</info>"; |
|
564 | + $title = "<info>{${$side.'Title'}}</info> > <info>{${$otherSide.'Title'}}</info>"; |
|
565 | 565 | $this->output($title); |
566 | 566 | $this->console->output(str_repeat('-', strlen(strip_tags($title)))); |
567 | 567 |