@@ -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 | */ |
@@ -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|null $messages Messages |
|
| 134 | 134 | * @param bool $newline Whether to append a newline |
| 135 | 135 | * @param int $type The output type |
| 136 | 136 | * |
@@ -149,10 +149,10 @@ |
||
| 149 | 149 | $newline = true; |
| 150 | 150 | } |
| 151 | 151 | if ($this->previousWasNewLine && $l >= 0 && $message[0] !== "\n") { |
| 152 | - $message = $this->getIndention() . $message; |
|
| 152 | + $message = $this->getIndention().$message; |
|
| 153 | 153 | } |
| 154 | 154 | if (strpos($message, "\n") !== false) { |
| 155 | - $message = str_replace("\n", "\n" . $this->getIndention(), $message); |
|
| 155 | + $message = str_replace("\n", "\n".$this->getIndention(), $message); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | // TODO: Indent wrapped lines - that's just not that easy because of the ANSI color escape codes |
@@ -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 | { |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | } elseif (is_array($command)) { |
| 67 | 67 | $command = implode('; ', $command); |
| 68 | 68 | } else { |
| 69 | - throw new \Netresearch\Kite\Exception('Command must be string or array, ' . gettype($command) . ' given.', 1312454906); |
|
| 69 | + throw new \Netresearch\Kite\Exception('Command must be string or array, '.gettype($command).' given.', 1312454906); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | parent::__construct($command, $cwd, null, null, null); |
@@ -141,14 +141,14 @@ discard block |
||
| 141 | 141 | { |
| 142 | 142 | $command = $this->getCommandLine(); |
| 143 | 143 | |
| 144 | - $this->console->output('<cmd>' . $this->getWorkingDirectory() . ' > ' . $command . '</cmd>', OutputInterface::VERBOSITY_VERBOSE); |
|
| 144 | + $this->console->output('<cmd>'.$this->getWorkingDirectory().' > '.$command.'</cmd>', OutputInterface::VERBOSITY_VERBOSE); |
|
| 145 | 145 | |
| 146 | 146 | if ($this->dryRun) { |
| 147 | 147 | return null; |
| 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 | } |
@@ -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 | { |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | $process = $this->console->createProcess($this->getCommand(), $this->get('cwd')); |
| 144 | 144 | $process->setDryRun(!$this->shouldExecute()); |
| 145 | 145 | foreach ($this->get('processSettings') as $key => $value) { |
| 146 | - $process->{'set' . ucfirst($key)}($value); |
|
| 146 | + $process->{'set'.ucfirst($key)}($value); |
|
| 147 | 147 | } |
| 148 | 148 | return $process->run(); |
| 149 | 149 | } |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | if ($options || $arguments) { |
| 170 | 170 | throw new Exception('Can not combine argv with options or arguments'); |
| 171 | 171 | } |
| 172 | - $cmd .= ' ' . (is_array($argv) ? implode(' ', $argv) : $argv); |
|
| 172 | + $cmd .= ' '.(is_array($argv) ? implode(' ', $argv) : $argv); |
|
| 173 | 173 | } else { |
| 174 | 174 | $cmd .= $this->renderOptions($options); |
| 175 | 175 | $cmd .= $this->renderArguments($arguments); |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | $argumentString = ''; |
| 225 | 225 | foreach ($arguments as $argument) { |
| 226 | 226 | $value = $this->expand($argument); |
| 227 | - $argumentString .= ' ' . escapeshellarg($value); |
|
| 227 | + $argumentString .= ' '.escapeshellarg($value); |
|
| 228 | 228 | } |
| 229 | 229 | return $argumentString; |
| 230 | 230 | } |
@@ -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 | { |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | if (!$name) { |
| 284 | 284 | return 0; |
| 285 | 285 | } |
| 286 | - $key = $type . ':' . $name; |
|
| 286 | + $key = $type.':'.$name; |
|
| 287 | 287 | $tasksAdded = 0; |
| 288 | 288 | if (array_key_exists($key, $this->job->deferredTasks)) { |
| 289 | 289 | while ($task = array_shift($this->job->deferredTasks[$key])) { |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | $shouldRun = $if; |
| 311 | 311 | } elseif (is_string($if)) { |
| 312 | 312 | $shouldRun = (boolean) $task->expand( |
| 313 | - '{' . $if . ' ? 1 : 0}' |
|
| 313 | + '{'.$if.' ? 1 : 0}' |
|
| 314 | 314 | ); |
| 315 | 315 | } else { |
| 316 | 316 | $shouldRun = call_user_func_array($if, array($task, $this->console)); |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | if ($name === '@self') { |
| 350 | 350 | $name = $this->get('name'); |
| 351 | 351 | } |
| 352 | - $key = $type . ':' . $name; |
|
| 352 | + $key = $type.':'.$name; |
|
| 353 | 353 | $this->job->deferredTasks[$key][] = $task; |
| 354 | 354 | } |
| 355 | 355 | } |
@@ -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()} |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | if (func_num_args() > 1) { |
| 267 | 267 | return func_get_arg(1); |
| 268 | 268 | } else { |
| 269 | - throw new Exception\MissingVariableException('Missing variable ' . $name); |
|
| 269 | + throw new Exception\MissingVariableException('Missing variable '.$name); |
|
| 270 | 270 | } |
| 271 | 271 | } |
| 272 | 272 | if ($parts && $value instanceof self && $value !== $this) { |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | $args[0] = implode('.', $parts); |
| 276 | 276 | return call_user_func_array(array($value, 'get'), $args); |
| 277 | 277 | } catch (Exception\MissingVariableException $e) { |
| 278 | - throw new Exception\MissingVariableException('Missing variable ' . $name); |
|
| 278 | + throw new Exception\MissingVariableException('Missing variable '.$name); |
|
| 279 | 279 | } |
| 280 | 280 | } |
| 281 | 281 | } |
@@ -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) { |
@@ -81,66 +81,66 @@ |
||
| 81 | 81 | parent::registerFunctions(); |
| 82 | 82 | $this->register( |
| 83 | 83 | 'confirm', |
| 84 | - function ($question) { |
|
| 84 | + function($question) { |
|
| 85 | 85 | }, |
| 86 | - function (array $values, $question) { |
|
| 86 | + function(array $values, $question) { |
|
| 87 | 87 | return $this->ask($values[self::VARIABLES_KEY], new ConfirmationQuestion("<question>$question</question> [y] ")); |
| 88 | 88 | } |
| 89 | 89 | ); |
| 90 | 90 | $this->register( |
| 91 | 91 | 'answer', |
| 92 | - function ($question) { |
|
| 92 | + function($question) { |
|
| 93 | 93 | }, |
| 94 | - function (array $values, $question) { |
|
| 94 | + function(array $values, $question) { |
|
| 95 | 95 | return $this->ask($values[self::VARIABLES_KEY], new Question("<question>$question</question> ")); |
| 96 | 96 | } |
| 97 | 97 | ); |
| 98 | 98 | $this->register( |
| 99 | 99 | 'choose', |
| 100 | - function ($question) { |
|
| 100 | + function($question) { |
|
| 101 | 101 | }, |
| 102 | - function (array $values, $question, array $choices) { |
|
| 102 | + function(array $values, $question, array $choices) { |
|
| 103 | 103 | return $this->ask($values[self::VARIABLES_KEY], new ChoiceQuestion("<question>$question</question> ", $choices)); |
| 104 | 104 | } |
| 105 | 105 | ); |
| 106 | 106 | $this->register( |
| 107 | 107 | 'isset', |
| 108 | - function ($var) { |
|
| 108 | + function($var) { |
|
| 109 | 109 | }, |
| 110 | - function (array $values, $var) { |
|
| 110 | + function(array $values, $var) { |
|
| 111 | 111 | return $values[self::VARIABLES_KEY]->has($var); |
| 112 | 112 | } |
| 113 | 113 | ); |
| 114 | 114 | $this->register( |
| 115 | 115 | 'empty', |
| 116 | - function ($var) { |
|
| 116 | + function($var) { |
|
| 117 | 117 | }, |
| 118 | - function (array $values, $var) { |
|
| 118 | + function(array $values, $var) { |
|
| 119 | 119 | return $values[self::VARIABLES_KEY]->has($var) && $values[self::VARIABLES_KEY]->get($var); |
| 120 | 120 | } |
| 121 | 121 | ); |
| 122 | 122 | $this->register( |
| 123 | 123 | 'get', |
| 124 | - function () { |
|
| 124 | + function() { |
|
| 125 | 125 | }, |
| 126 | - function (array $values, $var) { |
|
| 126 | + function(array $values, $var) { |
|
| 127 | 127 | return $values[self::VARIABLES_KEY]->get($var); |
| 128 | 128 | } |
| 129 | 129 | ); |
| 130 | 130 | $this->register( |
| 131 | 131 | 'set', |
| 132 | - function () { |
|
| 132 | + function() { |
|
| 133 | 133 | }, |
| 134 | - function (array $values, $var, $value) { |
|
| 134 | + function(array $values, $var, $value) { |
|
| 135 | 135 | $values[self::VARIABLES_KEY]->set($var, $value); |
| 136 | 136 | return $value; |
| 137 | 137 | } |
| 138 | 138 | ); |
| 139 | 139 | $this->register( |
| 140 | 140 | 'replace', |
| 141 | - function () { |
|
| 141 | + function() { |
|
| 142 | 142 | }, |
| 143 | - function (array $values, $search, $replace, $subject, $regex = false) { |
|
| 143 | + function(array $values, $search, $replace, $subject, $regex = false) { |
|
| 144 | 144 | if ($regex) { |
| 145 | 145 | return preg_replace($search, $replace, $subject); |
| 146 | 146 | } else { |
@@ -172,10 +172,10 @@ |
||
| 172 | 172 | } |
| 173 | 173 | if ($isTest) { |
| 174 | 174 | if ($isFunctionCall) { |
| 175 | - throw new SyntaxError('Can\'t use function return value in write context', $stream->current->cursor); |
|
| 175 | + throw new SyntaxError('Can\'t use function return value in write context', $stream->current->cursor); |
|
| 176 | 176 | } |
| 177 | 177 | if (!$stream->current->test(Token::PUNCTUATION_TYPE, ')')) { |
| 178 | - throw new SyntaxError('Expected )', $stream->current->cursor); |
|
| 178 | + throw new SyntaxError('Expected )', $stream->current->cursor); |
|
| 179 | 179 | } |
| 180 | 180 | $tokens[] = new Token(Token::STRING_TYPE, implode('.', $names), $token->cursor); |
| 181 | 181 | } else { |