@@ -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 |