EZP-31078: Enhanced Content Type Value Object (#1169)

ezsystems · Dec 20, 2019 · d901535 · d901535
1 parent d983e84
commit d901535
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/src/lib/Form/Processor/ContentType/ContentTypeFormProcessor.php b/src/lib/Form/Processor/ContentType/ContentTypeFormProcessor.php
@@ -176,9 +176,11 @@ private function resolveNewFieldDefinitionIdentifier(
         int $startIndex,
         string $fieldTypeIdentifier
     ): string {
-        $fieldDefinitionIdentifiers = array_map(function (FieldDefinition $fieldDefinition) {
-            return $fieldDefinition->identifier;
-        }, $contentTypeDraft->getFieldDefinitions());
+        $fieldDefinitionIdentifiers = $contentTypeDraft
+            ->getFieldDefinitions()
+            ->map(static function (FieldDefinition $fieldDefinition): string {
+                return $fieldDefinition->identifier;
+            });
 
         do {
             $fieldDefinitionIdentifier = sprintf('new_%s_%d', $fieldTypeIdentifier, ++$startIndex);

diff --git a/src/lib/Specification/ContentType/ContentTypeIsUser.php b/src/lib/Specification/ContentType/ContentTypeIsUser.php
@@ -46,12 +46,6 @@ public function isSatisfiedBy($contentType): bool
             return true;
         }
 
-        foreach ($contentType->getFieldDefinitions() as $fieldDefinition) {
-            if ($fieldDefinition->fieldTypeIdentifier === self::EZUSER_FIELD_TYPE_IDENTIFIER) {
-                return true;
-            }
-        }
-
-        return false;
+        return $contentType->hasFieldDefinitionOfType(self::EZUSER_FIELD_TYPE_IDENTIFIER);
     }
 }
diff --git a/src/lib/Util/FieldDefinitionGroupsUtil.php b/src/lib/Util/FieldDefinitionGroupsUtil.php
@@ -28,7 +28,7 @@ public function __construct(FieldsGroupsList $fieldsGroupsListHelper)
      *
      * @return array
      */
-    public function groupFieldDefinitions(array $fieldDefinitions): array
+    public function groupFieldDefinitions(iterable $fieldDefinitions): array
     {
         $fieldDefinitionsByGroup = [];
         foreach ($this->fieldsGroupsListHelper->getGroups() as $groupId => $groupName) {