@@ -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) { |
@@ -27,9 +27,9 @@ |
||
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | -if ((!$loader = includeIfExists(__DIR__.'/vendor/autoload.php')) && (!$loader = includeIfExists(__DIR__.'/../../autoload.php'))) { |
|
| 31 | - die('You must set up the project dependencies, run the following commands:'.PHP_EOL. |
|
| 32 | - 'curl -s http://getcomposer.org/installer | php'.PHP_EOL. |
|
| 33 | - 'php composer.phar install'.PHP_EOL); |
|
| 30 | +if ((!$loader = includeIfExists(__DIR__ . '/vendor/autoload.php')) && (!$loader = includeIfExists(__DIR__ . '/../../autoload.php'))) { |
|
| 31 | + die('You must set up the project dependencies, run the following commands:' . PHP_EOL . |
|
| 32 | + 'curl -s http://getcomposer.org/installer | php' . PHP_EOL . |
|
| 33 | + 'php composer.phar install' . PHP_EOL); |
|
| 34 | 34 | } |
| 35 | 35 | ?> |
@@ -179,7 +179,7 @@ |
||
| 179 | 179 | } |
| 180 | 180 | } |
| 181 | 181 | } elseif (!is_subclass_of(ltrim($definition, '\\'), 'Netresearch\\Kite\\' . $ucType)) { |
| 182 | - throw new Exception($definition .' must extend Netresearch\\Kite\\' . $ucType); |
|
| 182 | + throw new Exception($definition . ' must extend Netresearch\\Kite\\' . $ucType); |
|
| 183 | 183 | } |
| 184 | 184 | return $definition; |
| 185 | 185 | } |
@@ -148,7 +148,7 @@ |
||
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | parent::run( |
| 151 | - function ($type, $buffer) use ($callback) { |
|
| 151 | + function($type, $buffer) use ($callback) { |
|
| 152 | 152 | if ($callback) { |
| 153 | 153 | call_user_func($callback, $type, $buffer); |
| 154 | 154 | } |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | public function assemble() |
| 58 | 58 | { |
| 59 | 59 | $this->callback( |
| 60 | - function () { |
|
| 60 | + function() { |
|
| 61 | 61 | $scriptPath = $this->createScript(); |
| 62 | 62 | if ($webUrl = $this->get('webUrl')) { |
| 63 | 63 | $this->callScript($webUrl, $scriptPath); |
@@ -66,7 +66,7 @@ |
||
| 66 | 66 | public function assemble() |
| 67 | 67 | { |
| 68 | 68 | $this->callback( |
| 69 | - function () { |
|
| 69 | + function() { |
|
| 70 | 70 | $this->checkoutPackages( |
| 71 | 71 | (array) $this->get('branch'), |
| 72 | 72 | $this->get('merge'), |
@@ -272,7 +272,7 @@ |
||
| 272 | 272 | } elseif ($create) { |
| 273 | 273 | $branches = array_unique( |
| 274 | 274 | array_map( |
| 275 | - function ($el) { |
|
| 275 | + function($el) { |
|
| 276 | 276 | $parts = explode('/', $el); |
| 277 | 277 | return array_pop($parts); |
| 278 | 278 | }, |
@@ -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 | |
@@ -81,7 +81,7 @@ |
||
| 81 | 81 | public function assemble() |
| 82 | 82 | { |
| 83 | 83 | $this->callback( |
| 84 | - function () { |
|
| 84 | + function() { |
|
| 85 | 85 | $fix = $this->get('fix'); |
| 86 | 86 | $fixes = ($fix === true) ? $this->fixes : (array) $fix; |
| 87 | 87 | $checks = $this->get('check') ?: $this->checks; |
@@ -77,7 +77,7 @@ |
||
| 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); |