@@ -95,7 +95,7 @@ |
||
| 95 | 95 | |
| 96 | 96 | $output->writeln('<info>Migration: ' . $migration->name . '</info>'); |
| 97 | 97 | $output->writeln('Status: ' . $status); |
| 98 | - $output->writeln('Executed on: <info>' . ($migration->executionDate != null ? date("Y-m-d H:i:s", $migration->executionDate) : '--'). '</info>'); |
|
| 98 | + $output->writeln('Executed on: <info>' . ($migration->executionDate != null ? date("Y-m-d H:i:s", $migration->executionDate) : '--') . '</info>'); |
|
| 99 | 99 | $output->writeln('Execution notes: <info>' . $migration->executionError . '</info>'); |
| 100 | 100 | |
| 101 | 101 | if ($migration->status == Migration::STATUS_SUSPENDED) { |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $currentProcesses = array_splice($processesQueue, 0, $maxParallel); |
| 29 | 29 | // start the initial stack of processes |
| 30 | 30 | foreach ($currentProcesses as $process) { |
| 31 | - $process->start(function ($type, $buffer) use ($callback, $process) { |
|
| 31 | + $process->start(function($type, $buffer) use ($callback, $process) { |
|
| 32 | 32 | if ($callback) { |
| 33 | 33 | $callback($type, $buffer, $process); |
| 34 | 34 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | // directly add and start new process after the previous finished |
| 45 | 45 | if (count($processesQueue) > 0) { |
| 46 | 46 | $nextProcess = array_shift($processesQueue); |
| 47 | - $nextProcess->start(function ($type, $buffer) use ($callback, $nextProcess) { |
|
| 47 | + $nextProcess->start(function($type, $buffer) use ($callback, $nextProcess) { |
|
| 48 | 48 | if ($callback) { |
| 49 | 49 | $callback($type, $buffer, $nextProcess); |
| 50 | 50 | } |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | public function hasEmbeddedReferences($string) |
| 19 | 19 | { |
| 20 | 20 | $regexp = $this->getEmbeddedRegexp(); |
| 21 | - return (bool) preg_match_all($regexp, $string, $matches); |
|
| 21 | + return (bool)preg_match_all($regexp, $string, $matches); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | /** |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | { |
| 53 | 53 | // we need to alter the regexp we usr for std ref resolving, as it will be used to match parts of text, not the whole string |
| 54 | 54 | $regexp = substr($this->getRegexp(), 1, -1); |
| 55 | - return '/' . preg_quote($this->beginToken). preg_replace(array('/^\^/'), array(''), $regexp) . '[^' . $this->endToken . ']+' . preg_quote($this->endToken) . '/'; |
|
| 55 | + return '/' . preg_quote($this->beginToken) . preg_replace(array('/^\^/'), array(''), $regexp) . '[^' . $this->endToken . ']+' . preg_quote($this->endToken) . '/'; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | |
| 15 | 15 | public static function forceSigchildEnabled($force) |
| 16 | 16 | { |
| 17 | - self::$forceSigchildEnabled = (bool) $force; |
|
| 17 | + self::$forceSigchildEnabled = (bool)$force; |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | protected function isSigchildEnabled() |
@@ -22,23 +22,23 @@ |
||
| 22 | 22 | public function getProcess() |
| 23 | 23 | { |
| 24 | 24 | $parentClass = get_parent_class($this); |
| 25 | - $this_prefix = \Closure::bind(function(ProcessBuilder $builder){return $builder->prefix;}, null, $parentClass); |
|
| 25 | + $this_prefix = \Closure::bind(function(ProcessBuilder $builder) {return $builder->prefix; }, null, $parentClass); |
|
| 26 | 26 | $this_prefix = $this_prefix($this); |
| 27 | - $this_arguments = \Closure::bind(function(ProcessBuilder $builder){return $builder->arguments;}, null, $parentClass); |
|
| 27 | + $this_arguments = \Closure::bind(function(ProcessBuilder $builder) {return $builder->arguments; }, null, $parentClass); |
|
| 28 | 28 | $this_arguments = $this_arguments($this); |
| 29 | - $this_options = \Closure::bind(function(ProcessBuilder $builder){return $builder->options;}, null, $parentClass); |
|
| 29 | + $this_options = \Closure::bind(function(ProcessBuilder $builder) {return $builder->options; }, null, $parentClass); |
|
| 30 | 30 | $this_options = $this_options($this); |
| 31 | - $this_inheritEnv = \Closure::bind(function(ProcessBuilder $builder){return $builder->inheritEnv;}, null, $parentClass); |
|
| 31 | + $this_inheritEnv = \Closure::bind(function(ProcessBuilder $builder) {return $builder->inheritEnv; }, null, $parentClass); |
|
| 32 | 32 | $this_inheritEnv = $this_inheritEnv($this); |
| 33 | - $this_env = \Closure::bind(function(ProcessBuilder $builder){return $builder->env;}, null, $parentClass); |
|
| 33 | + $this_env = \Closure::bind(function(ProcessBuilder $builder) {return $builder->env; }, null, $parentClass); |
|
| 34 | 34 | $this_env = $this_env($this); |
| 35 | - $this_cwd = \Closure::bind(function(ProcessBuilder $builder){return $builder->cwd;}, null, $parentClass); |
|
| 35 | + $this_cwd = \Closure::bind(function(ProcessBuilder $builder) {return $builder->cwd; }, null, $parentClass); |
|
| 36 | 36 | $this_cwd = $this_cwd($this); |
| 37 | - $this_input = \Closure::bind(function(ProcessBuilder $builder){return $builder->input;}, null, $parentClass); |
|
| 37 | + $this_input = \Closure::bind(function(ProcessBuilder $builder) {return $builder->input; }, null, $parentClass); |
|
| 38 | 38 | $this_input = $this_input($this); |
| 39 | - $this_timeout = \Closure::bind(function(ProcessBuilder $builder){return $builder->timeout;}, null, $parentClass); |
|
| 39 | + $this_timeout = \Closure::bind(function(ProcessBuilder $builder) {return $builder->timeout; }, null, $parentClass); |
|
| 40 | 40 | $this_timeout = $this_timeout($this); |
| 41 | - $this_outputDisabled = \Closure::bind(function(ProcessBuilder $builder){return $builder->outputDisabled;}, null, $parentClass); |
|
| 41 | + $this_outputDisabled = \Closure::bind(function(ProcessBuilder $builder) {return $builder->outputDisabled; }, null, $parentClass); |
|
| 42 | 42 | $this_outputDisabled = $this_outputDisabled($this); |
| 43 | 43 | |
| 44 | 44 | if (0 === count($this_prefix) && 0 === count($this_arguments)) { |
@@ -78,8 +78,7 @@ |
||
| 78 | 78 | $this->errOutput->setVerbosity(OutputInterface::VERBOSITY_NORMAL); |
| 79 | 79 | $this->errOutput->writeln($message, $type); |
| 80 | 80 | $this->errOutput->setVerbosity(OutputInterface::VERBOSITY_QUIET); |
| 81 | - } |
|
| 82 | - else |
|
| 81 | + } else |
|
| 83 | 82 | { |
| 84 | 83 | $this->errOutput->writeln($message, $type); |
| 85 | 84 | } |
@@ -56,7 +56,9 @@ |
||
| 56 | 56 | |
| 57 | 57 | $query = new Query(); |
| 58 | 58 | $query->limit = $this->queryLimit; |
| 59 | - if (isset($query->performCount)) $query->performCount = false; |
|
| 59 | + if (isset($query->performCount)) { |
|
| 60 | + $query->performCount = false; |
|
| 61 | + } |
|
| 60 | 62 | $query->filter = $this->getQueryCriterion($key, $values); |
| 61 | 63 | $results = $this->repository->getTrashService()->findTrashItems($query); |
| 62 | 64 | |
@@ -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'])) { |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | if ($migrationDefinition->status == MigrationDefinition::STATUS_INVALID) { |
| 317 | - throw new MigrationBundleException("Can not execute " . $this->getEntityName($migrationDefinition). " '{$migrationDefinition->name}': {$migrationDefinition->parsingError}"); |
|
| 317 | + throw new MigrationBundleException("Can not execute " . $this->getEntityName($migrationDefinition) . " '{$migrationDefinition->name}': {$migrationDefinition->parsingError}"); |
|
| 318 | 318 | } |
| 319 | 319 | |
| 320 | 320 | // BC: handling of legacy method call signature |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | $this->migrationContext[$migration->name] = array('context' => $migrationContext); |
| 376 | 376 | |
| 377 | 377 | $steps = array_slice($migrationDefinition->steps->getArrayCopy(), $stepOffset); |
| 378 | - $i = $stepOffset+1; |
|
| 378 | + $i = $stepOffset + 1; |
|
| 379 | 379 | $finalStatus = Migration::STATUS_DONE; |
| 380 | 380 | $finalMessage = ''; |
| 381 | 381 | $error = null; |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | |
| 584 | 584 | // save migration status |
| 585 | 585 | |
| 586 | - $finalMessage = ($finalMessage != '' && $messageSuffix != '') ? $finalMessage . '. '. $messageSuffix : $finalMessage . $messageSuffix; |
|
| 586 | + $finalMessage = ($finalMessage != '' && $messageSuffix != '') ? $finalMessage . '. ' . $messageSuffix : $finalMessage . $messageSuffix; |
|
| 587 | 587 | |
| 588 | 588 | try { |
| 589 | 589 | $this->storageHandler->endMigration(new Migration( |
@@ -639,12 +639,12 @@ discard block |
||
| 639 | 639 | } |
| 640 | 640 | |
| 641 | 641 | if ($migration->status != Migration::STATUS_SUSPENDED) { |
| 642 | - throw new MigrationBundleException("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': it is not in suspended status"); |
|
| 642 | + throw new MigrationBundleException("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': it is not in suspended status"); |
|
| 643 | 643 | } |
| 644 | 644 | |
| 645 | 645 | $migrationDefinitions = $this->getMigrationsDefinitions(array($migration->path)); |
| 646 | 646 | if (!count($migrationDefinitions)) { |
| 647 | - throw new MigrationBundleException("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': its definition is missing"); |
|
| 647 | + throw new MigrationBundleException("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': its definition is missing"); |
|
| 648 | 648 | } |
| 649 | 649 | |
| 650 | 650 | $defs = $migrationDefinitions->getArrayCopy(); |
@@ -652,17 +652,17 @@ discard block |
||
| 652 | 652 | |
| 653 | 653 | $migrationDefinition = $this->parseMigrationDefinition($migrationDefinition); |
| 654 | 654 | if ($migrationDefinition->status == MigrationDefinition::STATUS_INVALID) { |
| 655 | - throw new MigrationBundleException("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': {$migrationDefinition->parsingError}"); |
|
| 655 | + throw new MigrationBundleException("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': {$migrationDefinition->parsingError}"); |
|
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | // restore context |
| 659 | 659 | $this->contextHandler->restoreCurrentContext($migration->name); |
| 660 | 660 | if (!isset($this->migrationContext[$migration->name])) { |
| 661 | - throw new MigrationBundleException("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': the stored context is missing"); |
|
| 661 | + throw new MigrationBundleException("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': the stored context is missing"); |
|
| 662 | 662 | } |
| 663 | 663 | $restoredContext = $this->migrationContext[$migration->name]; |
| 664 | 664 | if (!is_array($restoredContext) || !isset($restoredContext['context']) || !isset($restoredContext['step'])) { |
| 665 | - throw new MigrationBundleException("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': the stored context is invalid"); |
|
| 665 | + throw new MigrationBundleException("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': the stored context is invalid"); |
|
| 666 | 666 | } |
| 667 | 667 | |
| 668 | 668 | // update migration status |
@@ -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 |