@@ -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()) |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | // Add new attributes |
| 252 | - foreach($newFieldDefinitions as $newFieldDefinition) { |
|
| 252 | + foreach ($newFieldDefinitions as $newFieldDefinition) { |
|
| 253 | 253 | if ($newFieldDefinition->position == 0) { |
| 254 | 254 | $newFieldDefinition->position = ++$maxFieldDefinitionPos; |
| 255 | 255 | } |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | break; |
| 371 | 371 | case 'content_type_groups_ids': |
| 372 | 372 | $value = []; |
| 373 | - foreach($contentType->contentTypeGroups as $existingGroup) { |
|
| 373 | + foreach ($contentType->contentTypeGroups as $existingGroup) { |
|
| 374 | 374 | $value[] = $existingGroup->id; |
| 375 | 375 | } |
| 376 | 376 | break; |
@@ -766,7 +766,7 @@ discard block |
||
| 766 | 766 | $contentTypeGroup = $this->contentTypeGroupMatcher->matchOneByKey($contentTypeGroupId); |
| 767 | 767 | $contentTypeGroupId = $contentTypeGroup->id; |
| 768 | 768 | |
| 769 | - foreach($contentType->contentTypeGroups as $existingGroup) { |
|
| 769 | + foreach ($contentType->contentTypeGroups as $existingGroup) { |
|
| 770 | 770 | if ($existingGroup->id === $contentTypeGroupId) { |
| 771 | 771 | return; |
| 772 | 772 | } |
@@ -782,7 +782,7 @@ discard block |
||
| 782 | 782 | $contentTypeGroup = $this->contentTypeGroupMatcher->matchOneByKey($contentTypeGroupId); |
| 783 | 783 | $contentTypeGroupId = $contentTypeGroup->id; |
| 784 | 784 | |
| 785 | - foreach($contentType->contentTypeGroups as $existingGroup) { |
|
| 785 | + foreach ($contentType->contentTypeGroups as $existingGroup) { |
|
| 786 | 786 | if ($existingGroup->id === $contentTypeGroupId) { |
| 787 | 787 | $contentTypeService = $this->repository->getContentTypeService(); |
| 788 | 788 | $contentTypeService->unassignContentTypeGroup($contentType, $contentTypeGroup); |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use eZ\Publish\API\Repository\Values\ContentType\ContentType; |
| 6 | 6 | use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition; |
| 7 | -use eZ\Publish\API\Repository\Values\Content\Location; |
|
| 8 | 7 | use eZ\Publish\API\Repository\Values\Content\Content; |
| 9 | 8 | use eZ\Publish\API\Repository\Values\Content\ContentCreateStruct; |
| 10 | 9 | use eZ\Publish\API\Repository\Values\Content\ContentUpdateStruct; |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | $locations = $locationService->loadLocations($content->contentInfo); |
| 521 | 521 | if (count($locations) > 1) { |
| 522 | 522 | $otherParentLocations = array(); |
| 523 | - foreach($locations as $otherLocation) { |
|
| 523 | + foreach ($locations as $otherLocation) { |
|
| 524 | 524 | if ($otherLocation->id != $location->id) { |
| 525 | 525 | $otherParentLocations[] = $otherLocation->parentLocationId; |
| 526 | 526 | } |
@@ -696,7 +696,7 @@ discard block |
||
| 696 | 696 | }, |
| 697 | 697 | array_filter( |
| 698 | 698 | $this->repository->getContentLanguageService()->loadLanguages(), |
| 699 | - function ($language) { |
|
| 699 | + function($language) { |
|
| 700 | 700 | return $language->enabled; |
| 701 | 701 | } |
| 702 | 702 | ) |
@@ -36,7 +36,9 @@ |
||
| 36 | 36 | |
| 37 | 37 | $query = new Query(); |
| 38 | 38 | $query->limit = self::INT_MAX_16BIT; |
| 39 | - if (isset($query->performCount)) $query->performCount = false; |
|
| 39 | + if (isset($query->performCount)) { |
|
| 40 | + $query->performCount = false; |
|
| 41 | + } |
|
| 40 | 42 | $query->filter = $this->getQueryCriterion($key, $values); |
| 41 | 43 | $results = $this->repository->getTrashService()->findTrashItems($query); |
| 42 | 44 | |
@@ -22,13 +22,13 @@ |
||
| 22 | 22 | $contents = array(); |
| 23 | 23 | switch ($key) { |
| 24 | 24 | case self::MATCH_CONTENT_ID: |
| 25 | - foreach($match as $contentId) { |
|
| 25 | + foreach ($match as $contentId) { |
|
| 26 | 26 | $content = $this->repository->getContentService()->loadContent($contentId); |
| 27 | 27 | $contents[$content->id] = $content; |
| 28 | 28 | } |
| 29 | 29 | break; |
| 30 | 30 | case self::MATCH_CONTENT_REMOTE_ID: |
| 31 | - foreach($match as $contentRemoteId) { |
|
| 31 | + foreach ($match as $contentRemoteId) { |
|
| 32 | 32 | $content = $this->repository->getContentService()->loadContentByRemoteId($contentRemoteId); |
| 33 | 33 | $contents[$content->id] = $content; |
| 34 | 34 | } |
@@ -24,13 +24,13 @@ |
||
| 24 | 24 | $locations = array(); |
| 25 | 25 | switch ($key) { |
| 26 | 26 | case self::MATCH_LOCATION_ID: |
| 27 | - foreach($match as $locationId) { |
|
| 27 | + foreach ($match as $locationId) { |
|
| 28 | 28 | $location = $this->repository->getLocationService()->loadLocation($locationId); |
| 29 | 29 | $locations[$location->id] = $location; |
| 30 | 30 | } |
| 31 | 31 | break; |
| 32 | 32 | case self::MATCH_LOCATION_REMOTE_ID: |
| 33 | - foreach($match as $locationRemoteId) { |
|
| 33 | + foreach ($match as $locationRemoteId) { |
|
| 34 | 34 | $location = $this->repository->getLocationService()->loadLocationByRemoteId($locationRemoteId); |
| 35 | 35 | $locations[$location->id] = $location; |
| 36 | 36 | } |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | * @param array $sort |
| 16 | 16 | * @param int $offset |
| 17 | 17 | * @param int $limit |
| 18 | - |
|
| 19 | 18 | * @return LocationCollection |
| 20 | 19 | */ |
| 21 | 20 | public function matchLocation(array $conditions, array $sort = array(), $offset = 0, $limit = 0) |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | if (empty($paths)) { |
| 58 | 58 | $paths = array(); |
| 59 | 59 | /** @var $bundle \Symfony\Component\HttpKernel\Bundle\BundleInterface */ |
| 60 | - foreach($this->kernel->getBundles() as $bundle) |
|
| 60 | + foreach ($this->kernel->getBundles() as $bundle) |
|
| 61 | 61 | { |
| 62 | 62 | $path = $bundle->getPath() . "/" . $this->versionDirectory; |
| 63 | 63 | if (is_dir($path)) { |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | $definitions = array(); |
| 70 | - foreach($paths as $path) { |
|
| 70 | + foreach ($paths as $path) { |
|
| 71 | 71 | if (is_file($path)) { |
| 72 | 72 | $definitions[basename($path)] = $returnFilename ? $path : new MigrationDefinition( |
| 73 | 73 | basename($path), |
@@ -60,8 +60,7 @@ |
||
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | - } |
|
| 64 | - else { |
|
| 63 | + } else { |
|
| 65 | 64 | throw new \Exception("Path '$path' is neither a file nor directory"); |
| 66 | 65 | } |
| 67 | 66 | } |
@@ -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 | } |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | } else { |
| 75 | 75 | $args = array(); |
| 76 | 76 | } |
| 77 | - foreach($args as &$val) { |
|
| 77 | + foreach ($args as &$val) { |
|
| 78 | 78 | $val = $this->resolveReferencesRecursively($val); |
| 79 | 79 | } |
| 80 | 80 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | /** |
| 69 | 69 | * @param array $dsl |
| 70 | 70 | * @param array $context |
| 71 | - * @return string |
|
| 71 | + * @return boolean |
|
| 72 | 72 | * @throws \Exception |
| 73 | 73 | */ |
| 74 | 74 | protected function exists($dsl, $context) |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | /** |
| 197 | 197 | * @param array $dsl |
| 198 | 198 | * @param array $context |
| 199 | - * @return true |
|
| 199 | + * @return boolean |
|
| 200 | 200 | * @throws \Exception |
| 201 | 201 | */ |
| 202 | 202 | protected function copy($dsl, $context) |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | /** |
| 229 | 229 | * @param array $dsl |
| 230 | 230 | * @param array $context |
| 231 | - * @return true |
|
| 231 | + * @return boolean |
|
| 232 | 232 | * @throws \Exception |
| 233 | 233 | */ |
| 234 | 234 | protected function move($dsl, $context) |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | /** |
| 261 | 261 | * @param array $dsl |
| 262 | 262 | * @param array $context |
| 263 | - * @return true |
|
| 263 | + * @return boolean |
|
| 264 | 264 | * @throws \Exception |
| 265 | 265 | */ |
| 266 | 266 | protected function delete($dsl, $context) |