@@ -40,7 +40,7 @@ |
||
40 | 40 | public function sortField2Hash($value) |
41 | 41 | { |
42 | 42 | $ref = new \ReflectionClass('eZ\Publish\API\Repository\Values\Content\Location'); |
43 | - foreach($ref->getConstants() as $key => $val) { |
|
43 | + foreach ($ref->getConstants() as $key => $val) { |
|
44 | 44 | if (strpos($key, 'SORT_FIELD_') === 0 && $val == $value) { |
45 | 45 | $out = strtolower(substr($key, 11)); |
46 | 46 | if ($out == 'contentobject_id') { |
@@ -149,7 +149,7 @@ |
||
149 | 149 | |
150 | 150 | protected function versionStatusToHash($status) |
151 | 151 | { |
152 | - foreach(ContentVersionMatcher::STATUS_MAP as $own => $ez) { |
|
152 | + foreach (ContentVersionMatcher::STATUS_MAP as $own => $ez) { |
|
153 | 153 | if ($status == $ez) { |
154 | 154 | return $own; |
155 | 155 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $versions = array(); |
46 | 46 | |
47 | 47 | $contentCollection = $this->contentMatcher->match($contentConditions, $sort, $offset, $limit); |
48 | - foreach($contentCollection as $content) { |
|
48 | + foreach ($contentCollection as $content) { |
|
49 | 49 | $versions = array_merge($versions, $this->matchContentVersions($versionConditions, $content)); |
50 | 50 | } |
51 | 51 | |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | { |
152 | 152 | $versions = array(); |
153 | 153 | foreach ($this->findAllContentVersions($content) as $versionKey => $versionInfo) { |
154 | - foreach($values as $acceptedStatus) { |
|
154 | + foreach ($values as $acceptedStatus) { |
|
155 | 155 | if ($versionInfo->status == self::STATUS_MAP[$acceptedStatus]) { |
156 | 156 | $versions[$versionKey] = $versionInfo; |
157 | 157 | break; |
@@ -173,15 +173,15 @@ discard block |
||
173 | 173 | $contentVersionsCount = count($contentVersions); |
174 | 174 | $i = 0; |
175 | 175 | foreach ($contentVersions as $versionKey => $versionInfo) { |
176 | - foreach($values as $acceptedVersionNo) { |
|
177 | - if ($acceptedVersionNo > 0 ) { |
|
176 | + foreach ($values as $acceptedVersionNo) { |
|
177 | + if ($acceptedVersionNo > 0) { |
|
178 | 178 | if ($acceptedVersionNo == $versionInfo->versionNo) { |
179 | 179 | $versions[$versionKey] = $versionInfo; |
180 | 180 | break; |
181 | 181 | } |
182 | 182 | } else { |
183 | 183 | // negative $acceptedVersionNo means 'leave the last X versions', eg: -1 = leave the last version |
184 | - if ($i < $contentVersionsCount + $acceptedVersionNo) { |
|
184 | + if ($i < $contentVersionsCount + $acceptedVersionNo) { |
|
185 | 185 | $versions[$versionKey] = $versionInfo; |
186 | 186 | break; |
187 | 187 | |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | $contentVersions = $this->repository->getContentService()->loadVersions($content->contentInfo); |
203 | 203 | // different eZ kernels apparently sort versions in different order... |
204 | 204 | $sortedVersions = array(); |
205 | - foreach($contentVersions as $versionInfo) { |
|
205 | + foreach ($contentVersions as $versionInfo) { |
|
206 | 206 | $sortedVersions[$content->contentInfo->id . '/' . $versionInfo->versionNo] = $versionInfo; |
207 | 207 | } |
208 | 208 | ksort($sortedVersions); |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | return new Query\Criterion\DateMetadata(Query\Criterion\DateMetadata::CREATED, self::$operatorsMap[$operator], $match); |
149 | 149 | |
150 | 150 | case self::MATCH_GROUP: |
151 | - foreach($values as &$value) { |
|
151 | + foreach ($values as &$value) { |
|
152 | 152 | if (!ctype_digit($value)) { |
153 | 153 | $value = $this->groupMatcher->matchOneByKey($value)->id; |
154 | 154 | } |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | return new Query\Criterion\DateMetadata(Query\Criterion\DateMetadata::MODIFIED, self::$operatorsMap[$operator], $match); |
168 | 168 | |
169 | 169 | case self::MATCH_OBJECT_STATE: |
170 | - foreach($values as &$value) { |
|
170 | + foreach ($values as &$value) { |
|
171 | 171 | if (!ctype_digit($value)) { |
172 | 172 | $value = $this->stateMatcher->matchOneByKey($value)->id; |
173 | 173 | } |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | return new Query\Criterion\ObjectStateId($values); |
176 | 176 | |
177 | 177 | case self::MATCH_OWNER: |
178 | - foreach($values as &$value) { |
|
178 | + foreach ($values as &$value) { |
|
179 | 179 | if (!ctype_digit($value)) { |
180 | 180 | $value = $this->userMatcher->matchOneByKey($value)->id; |
181 | 181 | } |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | return new Query\Criterion\ParentLocationId($locationIds); |
196 | 196 | |
197 | 197 | case self::MATCH_SECTION: |
198 | - foreach($values as &$value) { |
|
198 | + foreach ($values as &$value) { |
|
199 | 199 | if (!ctype_digit($value)) { |
200 | 200 | $value = $this->sectionMatcher->matchOneByKey($value)->id; |
201 | 201 | } |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | |
217 | 217 | case self::MATCH_AND: |
218 | 218 | $subCriteria = array(); |
219 | - foreach($values as $subCriterion) { |
|
219 | + foreach ($values as $subCriterion) { |
|
220 | 220 | $value = reset($subCriterion); |
221 | 221 | $subCriteria[] = $this->getQueryCriterion(key($subCriterion), $value); |
222 | 222 | } |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | |
225 | 225 | case self::MATCH_OR: |
226 | 226 | $subCriteria = array(); |
227 | - foreach($values as $subCriterion) { |
|
227 | + foreach ($values as $subCriterion) { |
|
228 | 228 | $value = reset($subCriterion); |
229 | 229 | $subCriteria[] = $this->getQueryCriterion(key($subCriterion), $value); |
230 | 230 | } |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | |
267 | 267 | $direction = $this->hash2SortOrder($sortItem['sort_order']); |
268 | 268 | |
269 | - switch($sortItem['sort_field']) { |
|
269 | + switch ($sortItem['sort_field']) { |
|
270 | 270 | case self::SORT_CONTENT_ID: |
271 | 271 | $out[] = new SortClause\ContentId($direction); |
272 | 272 | break; |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | |
37 | 37 | // allow user to pass in selection values by name |
38 | 38 | $fieldSettings = null; |
39 | - foreach($fieldValue as $key => $val) { |
|
39 | + foreach ($fieldValue as $key => $val) { |
|
40 | 40 | |
41 | 41 | $val = $this->referenceResolver->resolveReference($val); |
42 | 42 | |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | if ($fieldSettings === null) { |
48 | 48 | $fieldSettings = $this->loadFieldSettings($context['contentTypeIdentifier'], $context['fieldIdentifier']); |
49 | 49 | } |
50 | - foreach($fieldSettings['options'] as $pos => $name) { |
|
50 | + foreach ($fieldSettings['options'] as $pos => $name) { |
|
51 | 51 | if ($name === $val) { |
52 | 52 | $fieldValue[$key] = $pos; |
53 | 53 | break; |
@@ -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 | } |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | $processes = array(); |
134 | 134 | /** @var MigrationDefinition $migrationDefinition */ |
135 | - foreach($paths as $path => $count) { |
|
135 | + foreach ($paths as $path => $count) { |
|
136 | 136 | $this->writeln("<info>Queueing processing of: $path ($count migrations)</info>", OutputInterface::VERBOSITY_VERBOSE); |
137 | 137 | |
138 | 138 | $process = $builder |
@@ -179,14 +179,14 @@ discard block |
||
179 | 179 | } |
180 | 180 | |
181 | 181 | $missed = $total - $this->migrationsDone[Migration::STATUS_DONE] - $this->migrationsDone[Migration::STATUS_FAILED] - $this->migrationsDone[Migration::STATUS_SKIPPED]; |
182 | - $this->writeln("\nExecuted ".$this->migrationsDone[Migration::STATUS_DONE].' migrations'. |
|
183 | - ', failed '.$this->migrationsDone[Migration::STATUS_FAILED]. |
|
184 | - ', skipped '.$this->migrationsDone[Migration::STATUS_SKIPPED]. |
|
182 | + $this->writeln("\nExecuted " . $this->migrationsDone[Migration::STATUS_DONE] . ' migrations' . |
|
183 | + ', failed ' . $this->migrationsDone[Migration::STATUS_FAILED] . |
|
184 | + ', skipped ' . $this->migrationsDone[Migration::STATUS_SKIPPED] . |
|
185 | 185 | ($missed ? ", missed $missed" : '')); |
186 | 186 | |
187 | 187 | $time = microtime(true) - $start; |
188 | 188 | // since we use subprocesses, we can not measure max memory used |
189 | - $this->writeln("<info>Time taken: ".sprintf('%.2f', $time)." secs</info>"); |
|
189 | + $this->writeln("<info>Time taken: " . sprintf('%.2f', $time) . " secs</info>"); |
|
190 | 190 | |
191 | 191 | return $subprocessesFailed + $this->migrationsDone[Migration::STATUS_FAILED] + $missed; |
192 | 192 | } |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | foreach ($toExecute as $name => $migrationDefinition) { |
229 | 229 | // let's skip migrations that we know are invalid - user was warned and he decided to proceed anyway |
230 | 230 | if ($migrationDefinition->status == MigrationDefinition::STATUS_INVALID) { |
231 | - $this->writeln("<comment>Skipping migration (invalid definition?) Path: ".$migrationDefinition->path."</comment>", self::VERBOSITY_CHILD); |
|
231 | + $this->writeln("<comment>Skipping migration (invalid definition?) Path: " . $migrationDefinition->path . "</comment>", self::VERBOSITY_CHILD); |
|
232 | 232 | $skipped++; |
233 | 233 | continue; |
234 | 234 | } |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | $this->executeMigrationInProcess($migrationDefinition, $force, $migrationService, $input); |
269 | 269 | |
270 | 270 | $executed++; |
271 | - } catch(\Exception $e) { |
|
271 | + } catch (\Exception $e) { |
|
272 | 272 | $failed++; |
273 | 273 | |
274 | 274 | $errorMessage = $e->getMessage(); |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | * @param string $buffer |
302 | 302 | * @param null|\Symfony\Component\Process\Process $process |
303 | 303 | */ |
304 | - public function onChildProcessOutput($type, $buffer, $process=null) |
|
304 | + public function onChildProcessOutput($type, $buffer, $process = null) |
|
305 | 305 | { |
306 | 306 | $lines = explode("\n", trim($buffer)); |
307 | 307 | |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | |
320 | 320 | // we tag the output with the id of the child process |
321 | 321 | if (trim($line) !== '') { |
322 | - $msg = '[' . ($process ? $process->getPid() : ''). '] ' . trim($line); |
|
322 | + $msg = '[' . ($process ? $process->getPid() : '') . '] ' . trim($line); |
|
323 | 323 | if ($type == 'err') { |
324 | 324 | $this->writeErrorln($msg, OutputInterface::VERBOSITY_QUIET, OutputInterface::OUTPUT_RAW); |
325 | 325 | } else { |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | |
354 | 354 | // filter away all migrations except 'to do' ones |
355 | 355 | $toExecute = array(); |
356 | - foreach($migrationDefinitions as $name => $migrationDefinition) { |
|
356 | + foreach ($migrationDefinitions as $name => $migrationDefinition) { |
|
357 | 357 | if (!isset($migrations[$name]) || (($migration = $migrations[$name]) && in_array($migration->status, $allowedStatuses))) { |
358 | 358 | $toExecute[$name] = $isChild ? $migrationService->parseMigrationDefinition($migrationDefinition) : $migrationDefinition; |
359 | 359 | } |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | { |
396 | 396 | $output->writeln('Found ' . count($toExecute) . ' migrations in ' . count($paths) . ' directories'); |
397 | 397 | $output->writeln('In the same directories, migrations previously executed: ' . $this->migrationsAlreadyDone[Migration::STATUS_DONE] . |
398 | - ', failed: ' . $this->migrationsAlreadyDone[Migration::STATUS_FAILED] . ', skipped: '. $this->migrationsAlreadyDone[Migration::STATUS_SKIPPED]); |
|
398 | + ', failed: ' . $this->migrationsAlreadyDone[Migration::STATUS_FAILED] . ', skipped: ' . $this->migrationsAlreadyDone[Migration::STATUS_SKIPPED]); |
|
399 | 399 | if ($this->migrationsAlreadyDone[Migration::STATUS_STARTED]) { |
400 | 400 | $output->writeln('<info>In the same directories, migrations currently executing: ' . $this->migrationsAlreadyDone[Migration::STATUS_STARTED] . '</info>'); |
401 | 401 | } |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | protected function groupMigrationsByPath($toExecute) |
409 | 409 | { |
410 | 410 | $paths = array(); |
411 | - foreach($toExecute as $name => $migrationDefinition) { |
|
411 | + foreach ($toExecute as $name => $migrationDefinition) { |
|
412 | 412 | $path = dirname($migrationDefinition->path); |
413 | 413 | if (!isset($paths[$path])) { |
414 | 414 | $paths[$path] = 1; |