@@ -599,8 +599,9 @@ |
||
| 599 | 599 | */ |
| 600 | 600 | public function getCurrentContext($migrationName) |
| 601 | 601 | { |
| 602 | - if (!isset($this->migrationContext[$migrationName])) |
|
| 603 | - return null; |
|
| 602 | + if (!isset($this->migrationContext[$migrationName])) { |
|
| 603 | + return null; |
|
| 604 | + } |
|
| 604 | 605 | $context = $this->migrationContext[$migrationName]; |
| 605 | 606 | // avoid attempting to store the current outputInterface when saving the context |
| 606 | 607 | if (isset($context['output'])) { |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | if ($migrationDefinition->status == MigrationDefinition::STATUS_INVALID) { |
| 313 | - throw new MigrationBundleException("Can not execute " . $this->getEntityName($migrationDefinition). " '{$migrationDefinition->name}': {$migrationDefinition->parsingError}"); |
|
| 313 | + throw new MigrationBundleException("Can not execute " . $this->getEntityName($migrationDefinition) . " '{$migrationDefinition->name}': {$migrationDefinition->parsingError}"); |
|
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | /// @todo add support for setting in $migrationContext a userContentType, userGroupContentType ? |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | |
| 345 | 345 | try { |
| 346 | 346 | |
| 347 | - $i = $stepOffset+1; |
|
| 347 | + $i = $stepOffset + 1; |
|
| 348 | 348 | $finalStatus = Migration::STATUS_DONE; |
| 349 | 349 | $finalMessage = null; |
| 350 | 350 | |
@@ -481,12 +481,12 @@ discard block |
||
| 481 | 481 | public function resumeMigration(Migration $migration, $useTransaction = true, array $forcedReferences = array()) |
| 482 | 482 | { |
| 483 | 483 | if ($migration->status != Migration::STATUS_SUSPENDED) { |
| 484 | - throw new MigrationBundleException("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': it is not in suspended status"); |
|
| 484 | + throw new MigrationBundleException("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': it is not in suspended status"); |
|
| 485 | 485 | } |
| 486 | 486 | |
| 487 | 487 | $migrationDefinitions = $this->getMigrationsDefinitions(array($migration->path)); |
| 488 | 488 | if (!count($migrationDefinitions)) { |
| 489 | - throw new MigrationBundleException("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': its definition is missing"); |
|
| 489 | + throw new MigrationBundleException("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': its definition is missing"); |
|
| 490 | 490 | } |
| 491 | 491 | |
| 492 | 492 | $defs = $migrationDefinitions->getArrayCopy(); |
@@ -494,24 +494,24 @@ discard block |
||
| 494 | 494 | |
| 495 | 495 | $migrationDefinition = $this->parseMigrationDefinition($migrationDefinition); |
| 496 | 496 | if ($migrationDefinition->status == MigrationDefinition::STATUS_INVALID) { |
| 497 | - throw new MigrationBundleException("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': {$migrationDefinition->parsingError}"); |
|
| 497 | + throw new MigrationBundleException("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': {$migrationDefinition->parsingError}"); |
|
| 498 | 498 | } |
| 499 | 499 | |
| 500 | 500 | // restore context |
| 501 | 501 | $this->contextHandler->restoreCurrentContext($migration->name); |
| 502 | 502 | |
| 503 | 503 | if ($forcedReferences) { |
| 504 | - foreach($forcedReferences as $name => $value) { |
|
| 504 | + foreach ($forcedReferences as $name => $value) { |
|
| 505 | 505 | $this->referenceResolver->addReference($name, $value, true); |
| 506 | 506 | } |
| 507 | 507 | } |
| 508 | 508 | |
| 509 | 509 | if (!isset($this->migrationContext[$migration->name])) { |
| 510 | - throw new MigrationBundleException("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': the stored context is missing"); |
|
| 510 | + throw new MigrationBundleException("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': the stored context is missing"); |
|
| 511 | 511 | } |
| 512 | 512 | $restoredContext = $this->migrationContext[$migration->name]; |
| 513 | - if (!is_array($restoredContext) || !isset($restoredContext['context']) || !isset($restoredContext['step'] )) { |
|
| 514 | - throw new MigrationBundleException("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': the stored context is invalid"); |
|
| 513 | + if (!is_array($restoredContext) || !isset($restoredContext['context']) || !isset($restoredContext['step'])) { |
|
| 514 | + throw new MigrationBundleException("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': the stored context is invalid"); |
|
| 515 | 515 | } |
| 516 | 516 | |
| 517 | 517 | // update migration status |
@@ -532,7 +532,7 @@ discard block |
||
| 532 | 532 | * @param bool|null $forceSigchildEnabled |
| 533 | 533 | * @return array |
| 534 | 534 | */ |
| 535 | - protected function migrationContextFromParameters($defaultLanguageCode = null, $adminLogin = null, $forceSigchildEnabled = null ) |
|
| 535 | + protected function migrationContextFromParameters($defaultLanguageCode = null, $adminLogin = null, $forceSigchildEnabled = null) |
|
| 536 | 536 | { |
| 537 | 537 | $properties = array(); |
| 538 | 538 | |
@@ -145,7 +145,9 @@ discard block |
||
| 145 | 145 | // q: when getting a query via QueryType, should we always inject offset/limit? |
| 146 | 146 | $query->limit = $limit != 0 ? $limit : $this->queryLimit; |
| 147 | 147 | $query->offset = $offset; |
| 148 | - if (isset($query->performCount)) $query->performCount = false; |
|
| 148 | + if (isset($query->performCount)) { |
|
| 149 | + $query->performCount = false; |
|
| 150 | + } |
|
| 149 | 151 | if (!empty($sort)) { |
| 150 | 152 | $query->sortClauses = $this->getSortClauses($sort); |
| 151 | 153 | } else { |
@@ -271,7 +273,9 @@ discard block |
||
| 271 | 273 | { |
| 272 | 274 | $query = new Query(); |
| 273 | 275 | $query->limit = $this->queryLimit; |
| 274 | - if (isset($query->performCount)) $query->performCount = false; |
|
| 276 | + if (isset($query->performCount)) { |
|
| 277 | + $query->performCount = false; |
|
| 278 | + } |
|
| 275 | 279 | $query->filter = new Query\Criterion\ParentLocationId($parentLocationIds); |
| 276 | 280 | $results = $this->getSearchService()->findContent($query); |
| 277 | 281 | |
@@ -311,7 +315,9 @@ discard block |
||
| 311 | 315 | { |
| 312 | 316 | $query = new Query(); |
| 313 | 317 | $query->limit = $this->queryLimit; |
| 314 | - if (isset($query->performCount)) $query->performCount = false; |
|
| 318 | + if (isset($query->performCount)) { |
|
| 319 | + $query->performCount = false; |
|
| 320 | + } |
|
| 315 | 321 | $query->filter = new Query\Criterion\ContentTypeIdentifier($contentTypeIdentifiers); |
| 316 | 322 | // sort objects by depth, lower to higher, so that deleting them has less chances of failure |
| 317 | 323 | // NB: we only do this in eZP versions that allow depth sorting on content queries |
@@ -339,7 +345,9 @@ discard block |
||
| 339 | 345 | { |
| 340 | 346 | $query = new Query(); |
| 341 | 347 | $query->limit = $this->queryLimit; |
| 342 | - if (isset($query->performCount)) $query->performCount = false; |
|
| 348 | + if (isset($query->performCount)) { |
|
| 349 | + $query->performCount = false; |
|
| 350 | + } |
|
| 343 | 351 | $query->filter = new Query\Criterion\ContentTypeId($contentTypeIds); |
| 344 | 352 | // sort objects by depth, lower to higher, so that deleting them has less chances of failure |
| 345 | 353 | // NB: we only do this in eZP versions that allow depth sorting on content queries |
@@ -107,7 +107,9 @@ discard block |
||
| 107 | 107 | if (!empty($sort)) { |
| 108 | 108 | $query->sortClauses = $this->getSortClauses($sort); |
| 109 | 109 | } |
| 110 | - if (isset($query->performCount)) $query->performCount = false; |
|
| 110 | + if (isset($query->performCount)) { |
|
| 111 | + $query->performCount = false; |
|
| 112 | + } |
|
| 111 | 113 | |
| 112 | 114 | $results = $this->getSearchService()->findLocations($query); |
| 113 | 115 | |
@@ -254,7 +256,9 @@ discard block |
||
| 254 | 256 | { |
| 255 | 257 | $query = new LocationQuery(); |
| 256 | 258 | $query->limit = self::INT_MAX_16BIT; |
| 257 | - if (isset($query->performCount)) $query->performCount = false; |
|
| 259 | + if (isset($query->performCount)) { |
|
| 260 | + $query->performCount = false; |
|
| 261 | + } |
|
| 258 | 262 | $query->filter = new Query\Criterion\ParentLocationId($parentLocationIds); |
| 259 | 263 | |
| 260 | 264 | $results = $this->getSearchService()->findLocations($query); |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | protected $ioDecorator; |
| 11 | 11 | protected $ioService; |
| 12 | 12 | |
| 13 | - public function __construct($ioRootDir, UrlDecorator $ioDecorator=null, $ioService=null) |
|
| 13 | + public function __construct($ioRootDir, UrlDecorator $ioDecorator = null, $ioService = null) |
|
| 14 | 14 | { |
| 15 | 15 | $this->ioRootDir = $ioRootDir; |
| 16 | 16 | $this->ioDecorator = $ioDecorator; |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | // which is misleading. We add the following loop to fix that, so that the status command will match more closely |
| 94 | 94 | // the 'migrate' command |
| 95 | 95 | if (count($paths)) { |
| 96 | - foreach($index as $migrationName => $data) { |
|
| 96 | + foreach ($index as $migrationName => $data) { |
|
| 97 | 97 | if (!isset($data['migration'])) { |
| 98 | 98 | $migration = $migrationsService->getMigration($migrationName); |
| 99 | 99 | if ($migration !== null) { |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | |
| 232 | 232 | if ($input->getOption('todo')) { |
| 233 | 233 | foreach ($data as $migrationData) { |
| 234 | - $output->writeln("$migrationData", OutputInterface::OUTPUT_RAW|OutputInterface::VERBOSITY_QUIET); |
|
| 234 | + $output->writeln("$migrationData", OutputInterface::OUTPUT_RAW | OutputInterface::VERBOSITY_QUIET); |
|
| 235 | 235 | } |
| 236 | 236 | return 0; |
| 237 | 237 | } |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | */ |
| 261 | 261 | protected function sortMigrationIndex(array &$index, $sortBy) |
| 262 | 262 | { |
| 263 | - switch($sortBy) { |
|
| 263 | + switch ($sortBy) { |
|
| 264 | 264 | case 'execution': |
| 265 | 265 | uasort($index, function($m1, $m2) { |
| 266 | 266 | if (isset($m1['migration']) && $m1['migration']->executionDate !== null) { |
@@ -84,7 +84,7 @@ |
||
| 84 | 84 | |
| 85 | 85 | $args = $dsl['arguments']; |
| 86 | 86 | |
| 87 | - foreach($args as &$val) { |
|
| 87 | + foreach ($args as &$val) { |
|
| 88 | 88 | $val = $this->resolveReferencesRecursively($val); |
| 89 | 89 | } |
| 90 | 90 | } else { |
@@ -75,7 +75,7 @@ |
||
| 75 | 75 | $body = isset($dsl['body']) ? $this->resolveReferencesInText($dsl['body']) : null; |
| 76 | 76 | |
| 77 | 77 | if (isset($dsl['client'])) { |
| 78 | - $client = $this->container->get('httplug.client.'.$this->referenceResolver->resolveReference($dsl['client'])); |
|
| 78 | + $client = $this->container->get('httplug.client.' . $this->referenceResolver->resolveReference($dsl['client'])); |
|
| 79 | 79 | } else { |
| 80 | 80 | $client = $this->container->get('httplug.client'); |
| 81 | 81 | } |
@@ -99,14 +99,14 @@ discard block |
||
| 99 | 99 | $subStep = new MigrationStep($type, $stepDef, array_merge($context, array())); |
| 100 | 100 | try { |
| 101 | 101 | $result = $stepExecutors[$j]->execute($subStep); |
| 102 | - } catch(MigrationStepSkippedException $e) { |
|
| 102 | + } catch (MigrationStepSkippedException $e) { |
|
| 103 | 103 | // all ok, continue the loop |
| 104 | - } catch(LoopContinueException $e) { |
|
| 104 | + } catch (LoopContinueException $e) { |
|
| 105 | 105 | // all ok, move to the next iteration |
| 106 | 106 | break; |
| 107 | 107 | } |
| 108 | 108 | } |
| 109 | - } catch(LoopBreakException $e) { |
|
| 109 | + } catch (LoopBreakException $e) { |
|
| 110 | 110 | // all ok, exit the loop |
| 111 | 111 | break; |
| 112 | 112 | } |
@@ -135,14 +135,14 @@ discard block |
||
| 135 | 135 | $subStep = new MigrationStep($type, $stepDef, array_merge($context, array())); |
| 136 | 136 | try { |
| 137 | 137 | $result = $stepExecutors[$j]->execute($subStep); |
| 138 | - } catch(MigrationStepSkippedException $e) { |
|
| 138 | + } catch (MigrationStepSkippedException $e) { |
|
| 139 | 139 | // all ok, continue the loop |
| 140 | - } catch(LoopContinueException $e) { |
|
| 140 | + } catch (LoopContinueException $e) { |
|
| 141 | 141 | // all ok, move to the next iteration |
| 142 | 142 | break; |
| 143 | 143 | } |
| 144 | 144 | } |
| 145 | - } catch(LoopBreakException $e) { |
|
| 145 | + } catch (LoopBreakException $e) { |
|
| 146 | 146 | // all ok, exit the loop |
| 147 | 147 | break; |
| 148 | 148 | } |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | $builderArgs = array($this->referenceResolver->resolveReference($dsl['command'])); |
| 72 | 72 | |
| 73 | 73 | if (isset($dsl['arguments'])) { |
| 74 | - foreach($dsl['arguments'] as $arg) { |
|
| 74 | + foreach ($dsl['arguments'] as $arg) { |
|
| 75 | 75 | /// @todo should this be recursive? |
| 76 | 76 | $builderArgs[] = $this->referenceResolver->resolveReference($arg); |
| 77 | 77 | } |