@@ -80,7 +80,7 @@ |
||
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
83 | - * @return string[] |
|
83 | + * @return integer[] |
|
84 | 84 | */ |
85 | 85 | public function listExecutors() |
86 | 86 | { |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | } |
255 | 255 | |
256 | 256 | if ($migrationDefinition->status == MigrationDefinition::STATUS_INVALID) { |
257 | - throw new \Exception("Can not execute " . $this->getEntityName($migrationDefinition). " '{$migrationDefinition->name}': {$migrationDefinition->parsingError}"); |
|
257 | + throw new \Exception("Can not execute " . $this->getEntityName($migrationDefinition) . " '{$migrationDefinition->name}': {$migrationDefinition->parsingError}"); |
|
258 | 258 | } |
259 | 259 | |
260 | 260 | /// @todo add support for setting in $migrationContext a userContentType ? |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | |
289 | 289 | try { |
290 | 290 | |
291 | - $i = $stepOffset+1; |
|
291 | + $i = $stepOffset + 1; |
|
292 | 292 | $finalStatus = Migration::STATUS_DONE; |
293 | 293 | $finalMessage = null; |
294 | 294 | |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | if ($previousUserId && $e2->getMessage() == 'There is no active transaction.') { |
376 | 376 | // since the migration succeeded and it was committed, no use to mark it as failed... |
377 | 377 | $finalStatus = Migration::STATUS_DONE; |
378 | - $errorMessage = 'Error post '.$this->getEntityName($migration).' execution: ' . $this->getFullExceptionMessage($e2) . |
|
378 | + $errorMessage = 'Error post ' . $this->getEntityName($migration) . ' execution: ' . $this->getFullExceptionMessage($e2) . |
|
379 | 379 | ' in file ' . $e2->getFile() . ' line ' . $e2->getLine(); |
380 | 380 | } else { |
381 | 381 | $errorMessage .= '. In addition, an exception was thrown while rolling back: ' . |
@@ -413,12 +413,12 @@ discard block |
||
413 | 413 | public function resumeMigration(Migration $migration, $useTransaction = true) |
414 | 414 | { |
415 | 415 | if ($migration->status != Migration::STATUS_SUSPENDED) { |
416 | - throw new \Exception("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': it is not in suspended status"); |
|
416 | + throw new \Exception("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': it is not in suspended status"); |
|
417 | 417 | } |
418 | 418 | |
419 | 419 | $migrationDefinitions = $this->getMigrationsDefinitions(array($migration->path)); |
420 | 420 | if (!count($migrationDefinitions)) { |
421 | - throw new \Exception("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': its definition is missing"); |
|
421 | + throw new \Exception("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': its definition is missing"); |
|
422 | 422 | } |
423 | 423 | |
424 | 424 | $defs = $migrationDefinitions->getArrayCopy(); |
@@ -426,18 +426,18 @@ discard block |
||
426 | 426 | |
427 | 427 | $migrationDefinition = $this->parseMigrationDefinition($migrationDefinition); |
428 | 428 | if ($migrationDefinition->status == MigrationDefinition::STATUS_INVALID) { |
429 | - throw new \Exception("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': {$migrationDefinition->parsingError}"); |
|
429 | + throw new \Exception("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': {$migrationDefinition->parsingError}"); |
|
430 | 430 | } |
431 | 431 | |
432 | 432 | // restore context |
433 | 433 | $this->contextHandler->restoreCurrentContext($migration->name); |
434 | 434 | |
435 | 435 | if (!isset($this->migrationContext[$migration->name])) { |
436 | - throw new \Exception("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': the stored context is missing"); |
|
436 | + throw new \Exception("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': the stored context is missing"); |
|
437 | 437 | } |
438 | 438 | $restoredContext = $this->migrationContext[$migration->name]; |
439 | - if (!is_array($restoredContext) || !isset($restoredContext['context']) || !isset($restoredContext['step'] )) { |
|
440 | - throw new \Exception("Can not resume ".$this->getEntityName($migration)." '{$migration->name}': the stored context is invalid"); |
|
439 | + if (!is_array($restoredContext) || !isset($restoredContext['context']) || !isset($restoredContext['step'])) { |
|
440 | + throw new \Exception("Can not resume " . $this->getEntityName($migration) . " '{$migration->name}': the stored context is invalid"); |
|
441 | 441 | } |
442 | 442 | |
443 | 443 | // update migration status |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | } |
151 | 151 | |
152 | 152 | // allow to generate migrations for many entities |
153 | - if (strpos($matchValue, ',') !== false ) { |
|
153 | + if (strpos($matchValue, ',') !== false) { |
|
154 | 154 | $matchValue = explode(',', $matchValue); |
155 | 155 | } |
156 | 156 | |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | { |
261 | 261 | $migrationService = $this->getMigrationService(); |
262 | 262 | $executors = $migrationService->listExecutors(); |
263 | - foreach($executors as $key => $name) { |
|
263 | + foreach ($executors as $key => $name) { |
|
264 | 264 | $executor = $migrationService->getExecutor($name); |
265 | 265 | if (!$executor instanceof MigrationGeneratorInterface) { |
266 | 266 | unset($executors[$key]); |
@@ -33,7 +33,7 @@ |
||
33 | 33 | public function sortField2Hash($value) |
34 | 34 | { |
35 | 35 | $ref = new \ReflectionClass('eZ\Publish\API\Repository\Values\Content\Location'); |
36 | - foreach($ref->getConstants() as $key => $val) { |
|
36 | + foreach ($ref->getConstants() as $key => $val) { |
|
37 | 37 | if (strpos($key, 'SORT_FIELD_') === 0 && $val == $value) { |
38 | 38 | return strtolower(substr($key, 11)); |
39 | 39 | } |
@@ -77,7 +77,7 @@ |
||
77 | 77 | /** |
78 | 78 | * Sets references to certain language attributes. |
79 | 79 | * |
80 | - * @param \eZ\Publish\API\Repository\Values\Content\Language|LanguageCollection $language |
|
80 | + * @param \eZ\Publish\API\Repository\Values\Content\Language $language |
|
81 | 81 | * @throws \InvalidArgumentException When trying to set a reference to an unsupported attribute |
82 | 82 | * @return boolean |
83 | 83 | */ |
@@ -192,7 +192,7 @@ |
||
192 | 192 | } |
193 | 193 | |
194 | 194 | // Add new attributes |
195 | - foreach($newFieldDefinitions as $newFieldDefinition) { |
|
195 | + foreach ($newFieldDefinitions as $newFieldDefinition) { |
|
196 | 196 | if ($newFieldDefinition->position == 0) { |
197 | 197 | $newFieldDefinition->position = ++$maxFieldDefinitionPos; |
198 | 198 | } |
@@ -652,6 +652,9 @@ discard block |
||
652 | 652 | return $fieldDefinitionUpdateStruct; |
653 | 653 | } |
654 | 654 | |
655 | + /** |
|
656 | + * @param string $contentTypeIdentifier |
|
657 | + */ |
|
655 | 658 | protected function getFieldSettings($value, $fieldTypeIdentifier, $contentTypeIdentifier) |
656 | 659 | { |
657 | 660 | // 1st update any references in the value array |
@@ -704,7 +707,7 @@ discard block |
||
704 | 707 | * |
705 | 708 | * @param string|array $newValue if passed a string, we will use $lang as its language. If passed an array, it will be used as is - expected format [ "eng-GB": "Name", "fre-FR": "Nom", ... ] |
706 | 709 | * @param string $lang ex: eng-GB. Not used when $newValue is an array |
707 | - * @param array $currentValue current set of values in all known languages. Will be merged with $newValue, $newValue taking precedence |
|
710 | + * @param string[] $currentValue current set of values in all known languages. Will be merged with $newValue, $newValue taking precedence |
|
708 | 711 | * @return array in the format [ "eng-GB": "Name", "fre-FR": "Nom", ... ] |
709 | 712 | */ |
710 | 713 | protected function getMultilingualValue($newValue, $lang, $currentValue = array()) |
@@ -234,11 +234,11 @@ |
||
234 | 234 | if ($mode != 'delete') { |
235 | 235 | $names = array(); |
236 | 236 | $descriptions = array(); |
237 | - foreach($objectStateGroup->languageCodes as $languageCode) { |
|
238 | - $names[$languageCode] = $objectStateGroup->getName($languageCode); |
|
237 | + foreach ($objectStateGroup->languageCodes as $languageCode) { |
|
238 | + $names[$languageCode] = $objectStateGroup->getName($languageCode); |
|
239 | 239 | } |
240 | - foreach($objectStateGroup->languageCodes as $languageCode) { |
|
241 | - $descriptions[$languageCode] = $objectStateGroup->getDescription($languageCode); |
|
240 | + foreach ($objectStateGroup->languageCodes as $languageCode) { |
|
241 | + $descriptions[$languageCode] = $objectStateGroup->getDescription($languageCode); |
|
242 | 242 | } |
243 | 243 | $groupData = array_merge( |
244 | 244 | $groupData, |
@@ -248,11 +248,11 @@ |
||
248 | 248 | if ($mode != 'delete') { |
249 | 249 | $names = array(); |
250 | 250 | $descriptions = array(); |
251 | - foreach($objectState->languageCodes as $languageCode) { |
|
252 | - $names[$languageCode] = $objectState->getName($languageCode); |
|
251 | + foreach ($objectState->languageCodes as $languageCode) { |
|
252 | + $names[$languageCode] = $objectState->getName($languageCode); |
|
253 | 253 | } |
254 | - foreach($objectState->languageCodes as $languageCode) { |
|
255 | - $descriptions[$languageCode] = $objectState->getDescription($languageCode); |
|
254 | + foreach ($objectState->languageCodes as $languageCode) { |
|
255 | + $descriptions[$languageCode] = $objectState->getDescription($languageCode); |
|
256 | 256 | } |
257 | 257 | $groupData = array_merge( |
258 | 258 | $groupData, |
@@ -114,7 +114,7 @@ |
||
114 | 114 | { |
115 | 115 | $migrationService = $this->migrationService; |
116 | 116 | $executors = $migrationService->listExecutors(); |
117 | - foreach($executors as $key => $name) { |
|
117 | + foreach ($executors as $key => $name) { |
|
118 | 118 | $executor = $migrationService->getExecutor($name); |
119 | 119 | if (!$executor instanceof MigrationGeneratorInterface) { |
120 | 120 | unset($executors[$key]); |
@@ -112,7 +112,7 @@ |
||
112 | 112 | |
113 | 113 | /** |
114 | 114 | * @todo cache this for faster access |
115 | - * @return array |
|
115 | + * @return integer[] |
|
116 | 116 | */ |
117 | 117 | protected function getGeneratingExecutors() |
118 | 118 | { |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | |
105 | 105 | foreach ($contentIds as $contentId) { |
106 | 106 | $content = $this->repository->getContentService()->loadContent($contentId); |
107 | - foreach($this->repository->getLocationService()->loadLocations($content->contentInfo) as $location) { |
|
107 | + foreach ($this->repository->getLocationService()->loadLocations($content->contentInfo) as $location) { |
|
108 | 108 | $locations[$location->id] = $location; |
109 | 109 | } |
110 | 110 | } |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | |
125 | 125 | foreach ($remoteContentIds as $remoteContentId) { |
126 | 126 | $content = $this->repository->getContentService()->loadContentByRemoteId($remoteContentId); |
127 | - foreach($this->repository->getLocationService()->loadLocations($content->contentInfo) as $location) { |
|
127 | + foreach ($this->repository->getLocationService()->loadLocations($content->contentInfo) as $location) { |
|
128 | 128 | $locations[$location->id] = $location; |
129 | 129 | } |
130 | 130 | } |
@@ -50,7 +50,9 @@ discard block |
||
50 | 50 | |
51 | 51 | $query = new LocationQuery(); |
52 | 52 | $query->limit = self::INT_MAX_16BIT; |
53 | - if (isset($query->performCount)) $query->performCount = false; |
|
53 | + if (isset($query->performCount)) { |
|
54 | + $query->performCount = false; |
|
55 | + } |
|
54 | 56 | $query->filter = $this->getQueryCriterion($key, $values); |
55 | 57 | $results = $this->repository->getSearchService()->findLocations($query); |
56 | 58 | |
@@ -196,7 +198,9 @@ discard block |
||
196 | 198 | { |
197 | 199 | $query = new LocationQuery(); |
198 | 200 | $query->limit = self::INT_MAX_16BIT; |
199 | - if (isset($query->performCount)) $query->performCount = false; |
|
201 | + if (isset($query->performCount)) { |
|
202 | + $query->performCount = false; |
|
203 | + } |
|
200 | 204 | $query->filter = new Query\Criterion\ParentLocationId($parentLocationIds); |
201 | 205 | |
202 | 206 | $results = $this->repository->getSearchService()->findLocations($query); |