@@ -28,7 +28,7 @@ |
||
| 28 | 28 | /** |
| 29 | 29 | * ConsoleOutput constructor. |
| 30 | 30 | * |
| 31 | - * @param int|mixed $verbosity The verbosity |
|
| 31 | + * @param integer $verbosity The verbosity |
|
| 32 | 32 | * @param boolean $decorated If output should be decorated |
| 33 | 33 | * @param OutputFormatterInterface|null $formatter Formatter |
| 34 | 34 | */ |
@@ -135,7 +135,7 @@ |
||
| 135 | 135 | * @param callable|null $callback A PHP callback to run whenever there is some |
| 136 | 136 | * output available on STDOUT or STDERR |
| 137 | 137 | * |
| 138 | - * @return mixed The output of the shell command or FALSE if the command returned a non-zero exit code and $ignoreErrors was enabled. |
|
| 138 | + * @return null|string The output of the shell command or FALSE if the command returned a non-zero exit code and $ignoreErrors was enabled. |
|
| 139 | 139 | */ |
| 140 | 140 | public function run($callback = NULL) |
| 141 | 141 | { |
@@ -136,7 +136,7 @@ |
||
| 136 | 136 | /** |
| 137 | 137 | * Execute the command |
| 138 | 138 | * |
| 139 | - * @return mixed |
|
| 139 | + * @return null|string |
|
| 140 | 140 | */ |
| 141 | 141 | protected function executeCommand() |
| 142 | 142 | { |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | /** |
| 427 | 427 | * Execute the next fetched task after given $task |
| 428 | 428 | * |
| 429 | - * @param Task|string $task Task or task name |
|
| 429 | + * @param string $task Task or task name |
|
| 430 | 430 | * |
| 431 | 431 | * @return $this |
| 432 | 432 | */ |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | * @param string $question The question |
| 445 | 445 | * @param string $default The default value |
| 446 | 446 | * |
| 447 | - * @return mixed|\Netresearch\Kite\Task |
|
| 447 | + * @return string |
|
| 448 | 448 | */ |
| 449 | 449 | public function answer($question, $default = null) |
| 450 | 450 | { |
@@ -506,11 +506,11 @@ discard block |
||
| 506 | 506 | * Run a composer command |
| 507 | 507 | * |
| 508 | 508 | * @param string $command The command to execute |
| 509 | - * @param array|string|null $optArg Options and arguments |
|
| 509 | + * @param string $optArg Options and arguments |
|
| 510 | 510 | * {@see \Netresearch\Kite\Task\ShellTask} |
| 511 | 511 | * @param array $processSettings Settings for symfony process class |
| 512 | 512 | * |
| 513 | - * @return string|\Netresearch\Kite\Task\ComposerTask |
|
| 513 | + * @return string |
|
| 514 | 514 | */ |
| 515 | 515 | public function composer($command, $optArg = null, array $processSettings = array()) |
| 516 | 516 | { |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | * {@see \Netresearch\Kite\Task\ShellTask} |
| 567 | 567 | * @param array $processSettings Settings for symfony process class |
| 568 | 568 | * |
| 569 | - * @return Task\GitTask|string |
|
| 569 | + * @return string |
|
| 570 | 570 | */ |
| 571 | 571 | public function git($command, $cwd = null, $optArg = null, array $processSettings = array()) |
| 572 | 572 | { |
@@ -576,7 +576,7 @@ discard block |
||
| 576 | 576 | /** |
| 577 | 577 | * Run a workflow for each of the $array's values. |
| 578 | 578 | * |
| 579 | - * @param array|\Traversable $array The object to iterate over |
|
| 579 | + * @param string $array The object to iterate over |
|
| 580 | 580 | * @param string|array $as Either string for |
| 581 | 581 | * foreach ($array as $as) |
| 582 | 582 | * or array for |
@@ -633,7 +633,7 @@ discard block |
||
| 633 | 633 | * {@see \Netresearch\Kite\Task\ShellTask} |
| 634 | 634 | * @param array $processSettings Settings for symfony process class |
| 635 | 635 | * |
| 636 | - * @return Task\RemoteShellTask|string |
|
| 636 | + * @return string |
|
| 637 | 637 | */ |
| 638 | 638 | public function remoteShell($command, $cwd = null, $optArg = null, array $processSettings = array()) |
| 639 | 639 | { |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | /** |
| 144 | 144 | * Get a variable from this very object (unexpanded) |
| 145 | 145 | * |
| 146 | - * @param mixed $offset Variable name |
|
| 146 | + * @param string $offset Variable name |
|
| 147 | 147 | * |
| 148 | 148 | * @internal Required set/get/has/remove in order to access entries of Variables |
| 149 | 149 | * without looking up parents. |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | /** |
| 175 | 175 | * Set a variable on this very object |
| 176 | 176 | * |
| 177 | - * @param mixed $offset Variable name |
|
| 177 | + * @param string $offset Variable name |
|
| 178 | 178 | * @param mixed $value The value |
| 179 | 179 | * |
| 180 | 180 | * @internal See {@see Variables::offsetGet()} |
@@ -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 | |
@@ -136,7 +136,7 @@ |
||
| 136 | 136 | /** |
| 137 | 137 | * Execute the command |
| 138 | 138 | * |
| 139 | - * @return mixed |
|
| 139 | + * @return null|string |
|
| 140 | 140 | */ |
| 141 | 141 | protected function executeCommand() |
| 142 | 142 | { |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | /** |
| 53 | 53 | * Constructor. |
| 54 | 54 | * |
| 55 | - * @param mixed $stream A stream resource |
|
| 55 | + * @param resource $stream A stream resource |
|
| 56 | 56 | * @param int $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface) |
| 57 | 57 | * @param bool|null $decorated Whether to decorate messages (null for auto-guessing) |
| 58 | 58 | * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter) |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | /** |
| 131 | 131 | * Write to output |
| 132 | 132 | * |
| 133 | - * @param array|string $messages Messages |
|
| 133 | + * @param string $messages Messages |
|
| 134 | 134 | * @param bool $newline Whether to append a newline |
| 135 | 135 | * @param int $type The output type |
| 136 | 136 | * |