Merge branch '1.5' into 1.11

ezecosystem · Apr 11, 2018 · f4569a6 · f4569a6
2 parents 92b60b6 + 667bdc8
commit f4569a6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/Form/Processor/ContentTypeFormProcessor.php b/lib/Form/Processor/ContentTypeFormProcessor.php
@@ -10,6 +10,7 @@
 
 use eZ\Publish\API\Repository\ContentTypeService;
 use eZ\Publish\API\Repository\Values\ContentType\ContentTypeDraft;
+use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
 use eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionCreateStruct;
 use eZ\Publish\Core\Helper\FieldsGroups\FieldsGroupsList;
 use EzSystems\RepositoryForms\Event\FormActionEvent;
@@ -168,7 +169,9 @@ private function resolveNewFieldDefinitionIdentifier(
         $startIndex,
         $fieldTypeIdentifier
     ) {
-        $fieldDefinitionIdentifiers = array_column($contentTypeDraft->getFieldDefinitions(), 'identifier');
+        $fieldDefinitionIdentifiers = array_map(function (FieldDefinition $fieldDefinition) {
+            return $fieldDefinition->identifier;
+        }, $contentTypeDraft->getFieldDefinitions());
 
         do {
             $fieldDefinitionIdentifier = sprintf('new_%s_%d', $fieldTypeIdentifier, ++$startIndex);