@@ -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; |
@@ -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; |
@@ -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 | /** |
@@ -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 |
@@ -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 | |
@@ -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 | |
@@ -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 | /** |
@@ -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 | /** |
@@ -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; |