@@ -12,7 +12,7 @@ |
||
12 | 12 | * @link http://www.netresearch.de |
13 | 13 | */ |
14 | 14 | |
15 | -require __DIR__ . '/bootstrap.php'; |
|
15 | +require __DIR__.'/bootstrap.php'; |
|
16 | 16 | |
17 | 17 | $dataHandler = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\DataHandling\DataHandler'); |
18 | 18 | $dataHandler->stripslashes_values = 0; |
@@ -14,8 +14,6 @@ |
||
14 | 14 | |
15 | 15 | namespace Netresearch\Kite\ExpressionLanguage; |
16 | 16 | use Netresearch\Kite\Task; |
17 | - |
|
18 | -use Symfony\Component\Console\Question\ChoiceQuestion; |
|
19 | 17 | use Symfony\Component\Console\Question\ConfirmationQuestion; |
20 | 18 | use Symfony\Component\Console\Question\Question; |
21 | 19 | use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface; |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | { |
123 | 123 | parent::registerFunctions(); |
124 | 124 | $functions = [ |
125 | - 'call' => function (array $values, $function) { |
|
125 | + 'call' => function(array $values, $function) { |
|
126 | 126 | $args = array_slice(func_get_args(), 2); |
127 | 127 | if (array_key_exists($function, $this->functions)) { |
128 | 128 | array_unshift($args, $values); |
@@ -130,29 +130,29 @@ discard block |
||
130 | 130 | } |
131 | 131 | return call_user_func_array($function, $args); |
132 | 132 | }, |
133 | - 'isset' => function (array $values, $var) { |
|
133 | + 'isset' => function(array $values, $var) { |
|
134 | 134 | return $values[self::VARIABLES_KEY]->has($var); |
135 | 135 | }, |
136 | - 'empty' => function (array $values, $var) { |
|
136 | + 'empty' => function(array $values, $var) { |
|
137 | 137 | return !$values[self::VARIABLES_KEY]->has($var) || !$values[self::VARIABLES_KEY]->get($var); |
138 | 138 | }, |
139 | - 'get' => function (array $values, $var) { |
|
139 | + 'get' => function(array $values, $var) { |
|
140 | 140 | return $values[self::VARIABLES_KEY]->get($var); |
141 | 141 | }, |
142 | - 'set' => function (array $values, $var, $value) { |
|
142 | + 'set' => function(array $values, $var, $value) { |
|
143 | 143 | $values[self::VARIABLES_KEY]->set($var, $value); |
144 | 144 | return $value; |
145 | 145 | }, |
146 | - 'confirm' => function (array $values, $question) { |
|
146 | + 'confirm' => function(array $values, $question) { |
|
147 | 147 | return $this->ask($values[self::VARIABLES_KEY], new ConfirmationQuestion("<question>$question</question> [y] ")); |
148 | 148 | }, |
149 | - 'answer' => function (array $values, $question) { |
|
149 | + 'answer' => function(array $values, $question) { |
|
150 | 150 | return $this->ask($values[self::VARIABLES_KEY], new Question("<question>$question</question> ")); |
151 | 151 | }, |
152 | - 'choose' => function (array $values, $question) { |
|
152 | + 'choose' => function(array $values, $question) { |
|
153 | 153 | return $this->ask($values[self::VARIABLES_KEY], new Question("<question>$question</question> ")); |
154 | 154 | }, |
155 | - 'replace' => function (array $values, $search, $replace, $subject, $regex = false) { |
|
155 | + 'replace' => function(array $values, $search, $replace, $subject, $regex = false) { |
|
156 | 156 | $values[self::VARIABLES_KEY]->console->output( |
157 | 157 | '<warning>Expression language function "replace" is deprecated ' |
158 | 158 | . 'and will be removed in 1.6.0 - use preg_replace or str_replace</warning>' |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | foreach ($functions as $name => $function) { |
168 | 168 | $this->register( |
169 | 169 | $name, |
170 | - function () { |
|
170 | + function() { |
|
171 | 171 | |
172 | 172 | }, |
173 | 173 | $function |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | /** |
106 | 106 | * Handle onBefore, onAfter and name |
107 | 107 | * |
108 | - * @param mixed $offset The name of the variable |
|
108 | + * @param string $offset The name of the variable |
|
109 | 109 | * @param mixed $value The value |
110 | 110 | * |
111 | 111 | * @return void |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | /** |
159 | 159 | * Generate name if it doesn't exist |
160 | 160 | * |
161 | - * @param mixed $offset The name of the variable |
|
161 | + * @param string $offset The name of the variable |
|
162 | 162 | * |
163 | 163 | * @return mixed |
164 | 164 | */ |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | 'type' => 'shell', |
40 | 40 | 'command' => [ |
41 | 41 | 'rm -rf typo3temp/Cache/*', |
42 | - '{config["php"]} ' . __DIR__ . '/typo3/clear-cache.php', |
|
43 | - '{config["php"]} ' . __DIR__ . '/typo3/schema-migration.php', |
|
42 | + '{config["php"]} '.__DIR__.'/typo3/clear-cache.php', |
|
43 | + '{config["php"]} '.__DIR__.'/typo3/schema-migration.php', |
|
44 | 44 | ], |
45 | 45 | 'processSettings' => ['pt' => true] |
46 | 46 | ] |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | ['workflow' => 'clearCodeCaches'], |
64 | 64 | [ |
65 | 65 | 'type' => 'scp', |
66 | - 'from' => __DIR__ . '/typo3', |
|
66 | + 'from' => __DIR__.'/typo3', |
|
67 | 67 | 'to' => '{node}:{node.deployPath}/current/{config["workspace"]}/typo3' |
68 | 68 | ], |
69 | 69 | [ |
@@ -70,12 +70,12 @@ discard block |
||
70 | 70 | if (is_string($composerJson)) { |
71 | 71 | $path = realpath($composerJson); |
72 | 72 | if (!$path) { |
73 | - throw new Exception('Could not find ' . $composerJson); |
|
73 | + throw new Exception('Could not find '.$composerJson); |
|
74 | 74 | } |
75 | 75 | $this->path = dirname($path); |
76 | 76 | $composerJson = json_decode(file_get_contents($path)); |
77 | 77 | if (!is_object($composerJson)) { |
78 | - throw new Exception('Could not load ' . $path); |
|
78 | + throw new Exception('Could not load '.$path); |
|
79 | 79 | } |
80 | 80 | } |
81 | 81 | foreach (get_object_vars($composerJson) as $key => $value) { |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | { |
97 | 97 | switch ($name) { |
98 | 98 | case 'git': |
99 | - $gitDir = $this->path . '/.git'; |
|
99 | + $gitDir = $this->path.'/.git'; |
|
100 | 100 | $this->git = file_exists($gitDir) && is_dir($gitDir); |
101 | 101 | break; |
102 | 102 | case 'branches': |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | $this->loadRequires(); |
115 | 115 | break; |
116 | 116 | default: |
117 | - throw new Exception('Invalid property ' . $name); |
|
117 | + throw new Exception('Invalid property '.$name); |
|
118 | 118 | |
119 | 119 | } |
120 | 120 | return $this->$name; |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | */ |
159 | 159 | public function reloadRequires() |
160 | 160 | { |
161 | - $file = $this->path . '/composer.json'; |
|
161 | + $file = $this->path.'/composer.json'; |
|
162 | 162 | if (file_exists($file)) { |
163 | 163 | $composerJson = json_decode(file_get_contents($file)); |
164 | 164 | unset($this->require); |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | if ($this->git) { |
213 | 213 | $this->composer->git('fetch', $this->path, array('p' => true, 'origin')); |
214 | 214 | try { |
215 | - $format = (self::$forEachRefHeadSupported ? '%(HEAD)' : '') . '|%(refname:short)|%(upstream:short)'; |
|
215 | + $format = (self::$forEachRefHeadSupported ? '%(HEAD)' : '').'|%(refname:short)|%(upstream:short)'; |
|
216 | 216 | $gitBr = $this->composer->git('for-each-ref', $this->path, ['format' => $format, 'refs/heads/', 'refs/remotes/origin']); |
217 | 217 | } catch (Exception\ProcessFailedException $e) { |
218 | 218 | if (trim($e->getProcess()->getErrorOutput()) === 'fatal: unknown field name: HEAD') { |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | try { |
253 | 253 | $this->tag = trim($this->composer->git('describe', $this->path, array('exact-match' => true, 'tags' => true))); |
254 | 254 | } catch (Exception\ProcessFailedException $e) { |
255 | - $this->tag = null; |
|
255 | + $this->tag = null; |
|
256 | 256 | } |
257 | 257 | } |
258 | 258 | } |
@@ -365,8 +365,8 @@ |
||
365 | 365 | /** |
366 | 366 | * Check that package is white-listed, is git-package and up-to-date |
367 | 367 | * |
368 | - * @param $package |
|
369 | - * @param $branch |
|
368 | + * @param Package $package |
|
369 | + * @param string $branch |
|
370 | 370 | * |
371 | 371 | * @return void |
372 | 372 | * |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | } |
58 | 58 | foreach (['whitelistNames', 'whitelistPaths', 'whitelistRemotes'] as $key) { |
59 | 59 | if (!array_key_exists($key, $config['composer'])) { |
60 | - $config['composer'][ $key ] = null; |
|
60 | + $config['composer'][$key] = null; |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | |
@@ -104,9 +104,9 @@ discard block |
||
104 | 104 | $this->git('push', $package->path, array('u' => 'origin', $package->branch)); |
105 | 105 | $this->console->output( |
106 | 106 | str_repeat(chr(8), strlen($package->name)) |
107 | - . '<info>' . $package->name . '</info>' |
|
107 | + . '<info>'.$package->name.'</info>' |
|
108 | 108 | ); |
109 | - unset($this->pushPackages[ $i ]); |
|
109 | + unset($this->pushPackages[$i]); |
|
110 | 110 | } |
111 | 111 | } |
112 | 112 | |
@@ -147,12 +147,12 @@ discard block |
||
147 | 147 | $checkedOutPackages = array_keys($packages); |
148 | 148 | $unfixedRequirements = 0; |
149 | 149 | while ($packageName = array_shift($checkedOutPackages)) { |
150 | - $branch = $packages[ $packageName ]->branch; |
|
151 | - $version = 'dev-' . $branch; |
|
150 | + $branch = $packages[$packageName]->branch; |
|
151 | + $version = 'dev-'.$branch; |
|
152 | 152 | foreach ($this->getPackages(false, false) as $package) { |
153 | 153 | if (array_key_exists($packageName, $package->requires)) { |
154 | 154 | // TODO: Set required version to branch alias, if any |
155 | - $requiredVersion = $package->requires[ $packageName ]; |
|
155 | + $requiredVersion = $package->requires[$packageName]; |
|
156 | 156 | if ($requiredVersion === '@dev') { |
157 | 157 | $requiredVersion = 'dev-master'; |
158 | 158 | } |
@@ -174,9 +174,9 @@ discard block |
||
174 | 174 | $checkedOutPackages[] = $package->name; |
175 | 175 | } |
176 | 176 | if (!array_key_exists($package->name, $packages)) { |
177 | - $packages[ $package->name ] = $package; |
|
177 | + $packages[$package->name] = $package; |
|
178 | 178 | } |
179 | - $this->pushPackages[ $packageName ] = $packages[ $packageName ]; |
|
179 | + $this->pushPackages[$packageName] = $packages[$packageName]; |
|
180 | 180 | $this->rewriteRequirement($package, $packageName, $version); |
181 | 181 | } else { |
182 | 182 | $unfixedRequirements++; |
@@ -206,8 +206,8 @@ discard block |
||
206 | 206 | { |
207 | 207 | $this->assertPackageIsWhiteListed($package); |
208 | 208 | |
209 | - $currentVersion = $package->requires[ $requiredPackage ]; |
|
210 | - $composerFile = $package->path . '/composer.json'; |
|
209 | + $currentVersion = $package->requires[$requiredPackage]; |
|
210 | + $composerFile = $package->path.'/composer.json'; |
|
211 | 211 | $composerFileContents = file_get_contents($composerFile); |
212 | 212 | $newComposerFileContents = preg_replace( |
213 | 213 | sprintf( |
@@ -215,12 +215,12 @@ discard block |
||
215 | 215 | preg_quote($requiredPackage, '/'), |
216 | 216 | preg_quote($currentVersion, '/') |
217 | 217 | ), |
218 | - '$1' . $newVersion, |
|
218 | + '$1'.$newVersion, |
|
219 | 219 | $composerFileContents |
220 | 220 | ); |
221 | 221 | file_put_contents($composerFile, $newComposerFileContents); |
222 | 222 | $package->reloadRequires(); |
223 | - if ($package->requires[ $requiredPackage ] !== $newVersion) { |
|
223 | + if ($package->requires[$requiredPackage] !== $newVersion) { |
|
224 | 224 | file_put_contents($composerFile, $composerFileContents); |
225 | 225 | $this->output('<error>Could not replace version</error> - generated composer.json was:'); |
226 | 226 | $this->output($newComposerFileContents); |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | |
236 | 236 | $this->console->output("Made <comment>$package->name</comment> require <comment>$requiredPackage $newVersion</comment>"); |
237 | 237 | |
238 | - $this->pushPackages[ $package->name ] = $package; |
|
238 | + $this->pushPackages[$package->name] = $package; |
|
239 | 239 | } |
240 | 240 | |
241 | 241 | /** |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | if (!$package->git) { |
276 | 276 | throw new Exception('Non git package can not be checked out'); |
277 | 277 | } |
278 | - $remoteBranch = 'origin/' . $branch; |
|
278 | + $remoteBranch = 'origin/'.$branch; |
|
279 | 279 | $isRemote = in_array($remoteBranch, $package->branches, true); |
280 | 280 | if (in_array($branch, $package->branches, true)) { |
281 | 281 | $this->git('checkout', $package->path, $branch); |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | } elseif ($create) { |
285 | 285 | $branches = array_unique( |
286 | 286 | array_map( |
287 | - function ($el) { |
|
287 | + function($el) { |
|
288 | 288 | $parts = explode('/', $el); |
289 | 289 | |
290 | 290 | return array_pop($parts); |
@@ -307,9 +307,9 @@ discard block |
||
307 | 307 | } |
308 | 308 | |
309 | 309 | if ($isRemote) { |
310 | - if (!isset($package->upstreams[ $branch ]) || $package->upstreams[ $branch ] !== $remoteBranch) { |
|
310 | + if (!isset($package->upstreams[$branch]) || $package->upstreams[$branch] !== $remoteBranch) { |
|
311 | 311 | $this->git('branch', $package->path, array('u' => $remoteBranch)); |
312 | - $package->upstreams[ $branch ] = $remoteBranch; |
|
312 | + $package->upstreams[$branch] = $remoteBranch; |
|
313 | 313 | } |
314 | 314 | $this->git('rebase', $package->path); |
315 | 315 | } |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | $this->console->output("Checked out <comment>{$package->name}</comment> at <comment>$branch</comment>"); |
318 | 318 | |
319 | 319 | $package->reloadRequires(); |
320 | - $package->version = 'dev-' . $branch; |
|
320 | + $package->version = 'dev-'.$branch; |
|
321 | 321 | $package->branch = $branch; |
322 | 322 | |
323 | 323 | return true; |
@@ -346,11 +346,11 @@ discard block |
||
346 | 346 | } |
347 | 347 | |
348 | 348 | if (isset($conflictedFiles) || $this->git('status', $package->path, array('porcelain' => true))) { |
349 | - $this->console->output('You are merging package <comment>' . $package->name . '</comment> from <comment>' . $branch . '</comment> into <comment>' . $package->branch . "</comment>.\n"); |
|
349 | + $this->console->output('You are merging package <comment>'.$package->name.'</comment> from <comment>'.$branch.'</comment> into <comment>'.$package->branch."</comment>.\n"); |
|
350 | 350 | if (!$message) { |
351 | 351 | $message = $this->answer( |
352 | 352 | 'Enter commit message:', |
353 | - 'Merged ' . $branch . ' into ' . $package->branch |
|
353 | + 'Merged '.$branch.' into '.$package->branch |
|
354 | 354 | ); |
355 | 355 | } |
356 | 356 | $this->git('commit', $package->path, array('n' => true, 'm' => $message)); |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | $this->console->output("Merged with <comment>$branch</comment> in <comment>{$package->name}</comment>"); |
360 | 360 | |
361 | 361 | $package->reloadRequires(); |
362 | - $this->pushPackages[ $package->name ] = $package; |
|
362 | + $this->pushPackages[$package->name] = $package; |
|
363 | 363 | } |
364 | 364 | |
365 | 365 | /** |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | throw new Exception('Non git package can not be merged'); |
381 | 381 | } |
382 | 382 | |
383 | - $this->git('fetch', $package->path, array('force' => true, 'origin', $branch . ':' . $branch)); |
|
383 | + $this->git('fetch', $package->path, array('force' => true, 'origin', $branch.':'.$branch)); |
|
384 | 384 | } |
385 | 385 | |
386 | 386 | /** |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | } else { |
402 | 402 | $mergeOptions['no-commit'] = true; |
403 | 403 | $ff = $branch == 'master' ? 'ff' : 'no-ff'; |
404 | - $mergeOptions[ $ff ] = true; |
|
404 | + $mergeOptions[$ff] = true; |
|
405 | 405 | } |
406 | 406 | |
407 | 407 | $mergeOptions[] = $branch; |
@@ -451,7 +451,7 @@ discard block |
||
451 | 451 | */ |
452 | 452 | private function resolveRequirementsConflict($package) |
453 | 453 | { |
454 | - $contents = file_get_contents($package->path . '/composer.json'); |
|
454 | + $contents = file_get_contents($package->path.'/composer.json'); |
|
455 | 455 | $ours = @json_decode( |
456 | 456 | preg_replace('/^<{7}.+\n(.+)\n(\|{7}|={7}).+>{7}.+$/smU', '$1', $contents) |
457 | 457 | ); |
@@ -463,8 +463,8 @@ discard block |
||
463 | 463 | } |
464 | 464 | $diff = array_diff_key($theirs = get_object_vars($theirs), $ours = get_object_vars($ours)); |
465 | 465 | foreach ($ours as $key => $value) { |
466 | - if ($key !== 'require' && (!array_key_exists($key, $theirs) || serialize($value) !== serialize($theirs[ $key ]))) { |
|
467 | - $diff[ $key ] = $value; |
|
466 | + if ($key !== 'require' && (!array_key_exists($key, $theirs) || serialize($value) !== serialize($theirs[$key]))) { |
|
467 | + $diff[$key] = $value; |
|
468 | 468 | } |
469 | 469 | } |
470 | 470 | if ($diff !== array()) { |
@@ -472,7 +472,7 @@ discard block |
||
472 | 472 | } |
473 | 473 | |
474 | 474 | $theirs['require'] = $this->mergeRequirements($package, $ours, $theirs); |
475 | - file_put_contents($package->path . '/composer.json', $this->jsonEncode($theirs)); |
|
475 | + file_put_contents($package->path.'/composer.json', $this->jsonEncode($theirs)); |
|
476 | 476 | } |
477 | 477 | |
478 | 478 | /** |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | { |
487 | 487 | return json_encode( |
488 | 488 | $var, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE |
489 | - ) . "\n"; |
|
489 | + )."\n"; |
|
490 | 490 | } |
491 | 491 | |
492 | 492 | /** |
@@ -504,17 +504,17 @@ discard block |
||
504 | 504 | $theirsRequire = isset($theirs['require']) && is_object($theirs['require']) ? get_object_vars($theirs['require']) : []; |
505 | 505 | $mergedRequires = array_merge($oursRequire, $theirsRequire); |
506 | 506 | $packages = $this->getPackages(false, false); |
507 | - $preferredVersion = 'dev-' . $package->branch; |
|
507 | + $preferredVersion = 'dev-'.$package->branch; |
|
508 | 508 | foreach ($mergedRequires as $packageName => $version) { |
509 | 509 | $actualVersion = ($version === '@dev') ? 'dev-master' : $version; |
510 | 510 | if (array_key_exists($packageName, $oursRequire) |
511 | - && $version !== $oursRequire[ $packageName ] |
|
512 | - && $actualVersion !== $oursRequire[ $packageName ] |
|
511 | + && $version !== $oursRequire[$packageName] |
|
512 | + && $actualVersion !== $oursRequire[$packageName] |
|
513 | 513 | && $actualVersion !== $preferredVersion |
514 | 514 | && array_key_exists($packageName, $packages) |
515 | - && in_array($package->branch, $packages[ $packageName ]->branches, true) |
|
515 | + && in_array($package->branch, $packages[$packageName]->branches, true) |
|
516 | 516 | ) { |
517 | - $mergedRequires[ $packageName ] = $preferredVersion; |
|
517 | + $mergedRequires[$packageName] = $preferredVersion; |
|
518 | 518 | } |
519 | 519 | } |
520 | 520 | |
@@ -536,7 +536,7 @@ discard block |
||
536 | 536 | $packages = array(); |
537 | 537 | foreach ($this->get('composer.packages') as $package) { |
538 | 538 | if ((!$gitOnly || $package->git) && (!$allowedOnly || $this->isPackageAllowed($package))) { |
539 | - $packages[ $package->name ] = $package; |
|
539 | + $packages[$package->name] = $package; |
|
540 | 540 | } |
541 | 541 | } |
542 | 542 | |
@@ -569,7 +569,7 @@ discard block |
||
569 | 569 | protected function isPackageAllowed(Package $package) |
570 | 570 | { |
571 | 571 | if (!is_array($this->packageNames)) { |
572 | - $this->packageNames = array_fill_keys($this->get('packages') ? : [], null); |
|
572 | + $this->packageNames = array_fill_keys($this->get('packages') ?: [], null); |
|
573 | 573 | } |
574 | 574 | |
575 | 575 | if ($this->packageNames) { |
@@ -577,11 +577,11 @@ discard block |
||
577 | 577 | return false; |
578 | 578 | } |
579 | 579 | if ($this->isPackageWhiteListed($package) === false) { |
580 | - if ($this->packageNames[ $package->name ] === null) { |
|
581 | - $this->packageNames[ $package->name ] = $this->confirm("The package $package->name is excluded by your whitelist configuration - are you sure you want to include it anyway?"); |
|
580 | + if ($this->packageNames[$package->name] === null) { |
|
581 | + $this->packageNames[$package->name] = $this->confirm("The package $package->name is excluded by your whitelist configuration - are you sure you want to include it anyway?"); |
|
582 | 582 | } |
583 | 583 | |
584 | - return $this->packageNames[ $package->name ]; |
|
584 | + return $this->packageNames[$package->name]; |
|
585 | 585 | } |
586 | 586 | |
587 | 587 | return true; |
@@ -602,9 +602,9 @@ discard block |
||
602 | 602 | if (!is_array($this->whitelists)) { |
603 | 603 | $this->whitelists = []; |
604 | 604 | foreach (['path', 'remote', 'name'] as $whiteListType) { |
605 | - $option = $this->get('whitelist' . ucfirst($whiteListType) . 's'); |
|
605 | + $option = $this->get('whitelist'.ucfirst($whiteListType).'s'); |
|
606 | 606 | if ($option) { |
607 | - $this->whitelists[ $whiteListType ] = '#^' . $option . '$#'; |
|
607 | + $this->whitelists[$whiteListType] = '#^'.$option.'$#'; |
|
608 | 608 | } |
609 | 609 | } |
610 | 610 | } |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | if ($requiredVersion !== $version) { |
160 | 160 | $this->assertPackageIsWhiteListed($package); |
161 | 161 | if (!$package->git) { |
162 | - throw new Exception("Package {$package->name} required to be installed from source"); |
|
162 | + throw new Exception("package {$package->name} required to be installed from source"); |
|
163 | 163 | } |
164 | 164 | if ($autoFix) { |
165 | 165 | $fix = true; |
@@ -555,7 +555,7 @@ discard block |
||
555 | 555 | protected function assertPackageIsWhiteListed($package) |
556 | 556 | { |
557 | 557 | if ($this->isPackageWhiteListed($package) === false) { |
558 | - throw new Exception("Package {$package->name} is not in white list"); |
|
558 | + throw new Exception("package {$package->name} is not in white list"); |
|
559 | 559 | } |
560 | 560 | } |
561 | 561 |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | if (substr($method, 0, 5) === 'check' && $method[5] === strtoupper($method[5])) { |
59 | 59 | $check = substr($method, 5); |
60 | 60 | $this->checks[] = $check; |
61 | - if (method_exists($this, 'fix' . $check)) { |
|
61 | + if (method_exists($this, 'fix'.$check)) { |
|
62 | 62 | $this->fixes[] = $check; |
63 | 63 | } |
64 | 64 | } |
@@ -68,12 +68,12 @@ discard block |
||
68 | 68 | 'check' => array( |
69 | 69 | 'type' => 'array', |
70 | 70 | 'option' => true, |
71 | - 'label' => 'Only execute these checks - available checks are ' . implode(', ', $this->checks), |
|
71 | + 'label' => 'Only execute these checks - available checks are '.implode(', ', $this->checks), |
|
72 | 72 | ), |
73 | 73 | 'fix' => array( |
74 | 74 | 'type' => 'boolean|array', |
75 | 75 | 'option' => true, |
76 | - 'label' => 'Enable fixes and optionally reduce to certain fixes - available fixes are ' . implode(', ', $this->fixes), |
|
76 | + 'label' => 'Enable fixes and optionally reduce to certain fixes - available fixes are '.implode(', ', $this->fixes), |
|
77 | 77 | ), |
78 | 78 | ) + parent::configureVariables(); |
79 | 79 | } |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | public function assemble() |
87 | 87 | { |
88 | 88 | $this->callback( |
89 | - function () { |
|
89 | + function() { |
|
90 | 90 | $fix = $this->get('fix'); |
91 | 91 | $fixes = ($fix === true) ? $this->fixes : (array) $fix; |
92 | 92 | $checks = $this->get('check') ?: $this->checks; |
@@ -120,11 +120,11 @@ discard block |
||
120 | 120 | if ($packageNames && !in_array($package->name, $packageNames, true)) { |
121 | 121 | continue; |
122 | 122 | } |
123 | - if (is_string($message = $this->{'check' . $check}($package))) { |
|
123 | + if (is_string($message = $this->{'check'.$check}($package))) { |
|
124 | 124 | if (!$packageNames && !$errors) { |
125 | 125 | $this->console->output( |
126 | 126 | str_repeat(chr(8), strlen($check)) |
127 | - . '<fg=red;bg=black>' . $check . '</>' |
|
127 | + . '<fg=red;bg=black>'.$check.'</>' |
|
128 | 128 | ); |
129 | 129 | } |
130 | 130 | $message = sprintf($message, "package <comment>$package->name</>"); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | if ($fix) { |
134 | 134 | $this->dontCheckCurrentPackageAgain = false; |
135 | 135 | $this->console->indent(); |
136 | - $this->{'fix' . $check}($package); |
|
136 | + $this->{'fix'.$check}($package); |
|
137 | 137 | $this->console->outdent(); |
138 | 138 | if (!$this->dontCheckCurrentPackageAgain) { |
139 | 139 | $rerunForPackages[] = $package->name; |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | if (!$errors) { |
156 | 156 | $this->console->output( |
157 | 157 | str_repeat(chr(8), strlen($check)) |
158 | - . '<fg=green;bg=black>' . $check . '</>' |
|
158 | + . '<fg=green;bg=black>'.$check.'</>' |
|
159 | 159 | ); |
160 | 160 | } |
161 | 161 | $this->console->outdent(); |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | $this->git('reset', $package->path); |
213 | 213 | $args = 'save -u'; |
214 | 214 | if ($message = $this->answer('Message for stash:')) { |
215 | - $args .= ' ' . escapeshellarg($message); |
|
215 | + $args .= ' '.escapeshellarg($message); |
|
216 | 216 | } |
217 | 217 | $this->git('stash', $package->path, $args); |
218 | 218 | break; |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | case 2: |
284 | 284 | foreach ($commands as $command) { |
285 | 285 | $pck = "<comment>{$package->name}</comment>"; |
286 | - $this->console->output($msg = ucfirst($command) . "ing $pck...", false); |
|
286 | + $this->console->output($msg = ucfirst($command)."ing $pck...", false); |
|
287 | 287 | $this->git($command, $package->path, isset($options) ? $options : null); |
288 | 288 | $this->console->output( |
289 | 289 | str_repeat(chr(8), strlen(strip_tags($msg))) |
@@ -330,8 +330,8 @@ discard block |
||
330 | 330 | } |
331 | 331 | if ($package->requiredBranch && $package->requiredBranch !== $requiredBranch) { |
332 | 332 | $package->invalidRequirements = true; |
333 | - return '<error>' . array_pop($dependentPackages) |
|
334 | - . ' and ' . array_pop($dependentPackages) |
|
333 | + return '<error>'.array_pop($dependentPackages) |
|
334 | + . ' and '.array_pop($dependentPackages) |
|
335 | 335 | . ' require %s in different branches</error>'; |
336 | 336 | } |
337 | 337 | $package->requiredBranch = $requiredBranch; |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | } |
344 | 344 | } |
345 | 345 | } |
346 | - $constraint = $package->tag ?: 'dev-' . $package->branch; |
|
346 | + $constraint = $package->tag ?: 'dev-'.$package->branch; |
|
347 | 347 | if ($package->requiredBranch && $package->requiredBranch !== $package->branch) { |
348 | 348 | return "%s is at <comment>$constraint</comment> but is required at <comment>dev-{$package->requiredBranch}</comment>"; |
349 | 349 | } |
@@ -367,8 +367,8 @@ discard block |
||
367 | 367 | if ($package->invalidRequirements) { |
368 | 368 | $this->doExit('Can not fix that', 1); |
369 | 369 | } |
370 | - $currentConstraint = $package->tag ?: 'dev-' . $package->branch; |
|
371 | - $requiredConstraint = 'dev-' . $package->requiredBranch; |
|
370 | + $currentConstraint = $package->tag ?: 'dev-'.$package->branch; |
|
371 | + $requiredConstraint = 'dev-'.$package->requiredBranch; |
|
372 | 372 | if ($package->requiredBranch) { |
373 | 373 | $actions = array( |
374 | 374 | 1 => "Show divergent commits between <comment>$currentConstraint</comment> and <comment>$requiredConstraint</comment> (and ask again)", |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | if ($package->git && !$package->isRoot) { |
422 | 422 | $remote = false; |
423 | 423 | do { |
424 | - $reference = ($remote ? 'origin/' : '') . $package->source->reference; |
|
424 | + $reference = ($remote ? 'origin/' : '').$package->source->reference; |
|
425 | 425 | try { |
426 | 426 | $rawCounts = $this->git('rev-list', $package->path, "--count --left-right --cherry-pick {$reference}..."); |
427 | 427 | break; |
@@ -436,9 +436,9 @@ discard block |
||
436 | 436 | if ($counts[0] || $counts[1]) { |
437 | 437 | $num = $counts[0] ?: $counts[1]; |
438 | 438 | $type = $counts[0] ? 'behind</>' : 'ahead</> of'; |
439 | - return '%s is <comment>' . $num . ' commit' . ($num > 1 ? 's ' : ' ') |
|
440 | - . $type . ' locked commit <comment>' |
|
441 | - . substr($package->source->reference, 0, 7) . '</>'; |
|
439 | + return '%s is <comment>'.$num.' commit'.($num > 1 ? 's ' : ' ') |
|
440 | + . $type.' locked commit <comment>' |
|
441 | + . substr($package->source->reference, 0, 7).'</>'; |
|
442 | 442 | } |
443 | 443 | } |
444 | 444 | return null; |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | if ($package->isRoot) { |
491 | 491 | try { |
492 | 492 | $this->composer('validate', '--no-check-all --no-check-publish'); |
493 | - } catch(Exception\ProcessFailedException $e) { |
|
493 | + } catch (Exception\ProcessFailedException $e) { |
|
494 | 494 | return 'The lock file is not up to date with the latest changes in root composer.json'; |
495 | 495 | } |
496 | 496 | } |
@@ -558,12 +558,12 @@ discard block |
||
558 | 558 | $side = $i ? 'left' : 'right'; |
559 | 559 | $otherSide = $i ? 'right' : 'left'; |
560 | 560 | $args = "--$side-only --cherry-pick --pretty=format:'%C(yellow)%h %Cgreen%cd %an%Creset%n %s' --abbrev-commit --date=local "; |
561 | - $args .= $ref . '...'; |
|
561 | + $args .= $ref.'...'; |
|
562 | 562 | $log = $this->git('log', $package->path, $args, array('shy' => true)); |
563 | 563 | if ($log) { |
564 | 564 | $this->console->output(''); |
565 | 565 | |
566 | - $title = "<info>{${$side . 'Title'}}</info> > <info>{${$otherSide . 'Title'}}</info>"; |
|
566 | + $title = "<info>{${$side.'Title'}}</info> > <info>{${$otherSide.'Title'}}</info>"; |
|
567 | 567 | $this->output($title); |
568 | 568 | $this->console->output(str_repeat('-', strlen(strip_tags($title)))); |
569 | 569 |
@@ -13,7 +13,6 @@ |
||
13 | 13 | |
14 | 14 | namespace Netresearch\Kite\Workflow\Composer; |
15 | 15 | use Netresearch\Kite\Exception; |
16 | - |
|
17 | 16 | use Netresearch\Kite\Workflow; |
18 | 17 | |
19 | 18 | /** |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | public function assemble() |
67 | 67 | { |
68 | 68 | $this->callback( |
69 | - function () { |
|
69 | + function() { |
|
70 | 70 | $this->checkoutPackages( |
71 | 71 | array_unique(array_merge((array) $this->get('branch'), ['master'])), |
72 | 72 | $this->get('merge'), |
@@ -109,9 +109,9 @@ discard block |
||
109 | 109 | $lastBranch = array_pop($branches); |
110 | 110 | $message = 'Could not find branch '; |
111 | 111 | if ($branches) { |
112 | - $message .= implode(', ', $branches) . ' or '; |
|
112 | + $message .= implode(', ', $branches).' or '; |
|
113 | 113 | } |
114 | - $message .= $lastBranch . ' in any installed package'; |
|
114 | + $message .= $lastBranch.' in any installed package'; |
|
115 | 115 | $this->console->output("<warning>$message</warning>"); |
116 | 116 | return; |
117 | 117 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | die('Access denied'); |
22 | 22 | } |
23 | 23 | |
24 | -define('PATH_site', getcwd() . DIRECTORY_SEPARATOR); |
|
24 | +define('PATH_site', getcwd().DIRECTORY_SEPARATOR); |
|
25 | 25 | |
26 | 26 | $typo3VersionIsMinimum7 = true; |
27 | 27 | $typo3VersionIsMinimum8 = false; |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | if ($typo3VersionIsMinimum7) { |
37 | - $classLoader = include getcwd() . '/typo3_src/vendor/autoload.php'; |
|
37 | + $classLoader = include getcwd().'/typo3_src/vendor/autoload.php'; |
|
38 | 38 | $bootstrap = \TYPO3\CMS\Core\Core\Bootstrap::getInstance(); |
39 | 39 | $bootstrap->initializeClassLoader($classLoader); |
40 | 40 |