Add support for rich text fields and custom validation messages

src/Mapper/BaseMapper.php

@@ -13,6 +13,8 @@
 
 use Contentful\Core\ResourceBuilder\MapperInterface;
 use Contentful\Core\ResourceBuilder\ObjectHydrator;
+use Contentful\Management\Resource\ContentType\Validation\AbstractCustomMessageValidation;
+use Contentful\Management\Resource\ContentType\Validation\ValidationInterface;
 use Contentful\Management\ResourceBuilder;
 
 /**
@@ -38,4 +40,29 @@ public function __construct(ResourceBuilder $builder)
         $this->builder = $builder;
         $this->hydrator = new ObjectHydrator();
     }
+
+    protected function mapValidation(array $data): ?ValidationInterface
+    {
+        $message = null;
+        if (isset($data['message'])) {
+            $message = $data['message'];
+            unset($data['message']);
+        }
+
+        if (empty(array_values($data)[0])) {
+            return null;
+        }
+
+        $fqcn = '\\Contentful\\Management\\Mapper\\ContentType\\Validation\\'.\ucfirst(key($data)).'Validation';
+
+        /** @var ValidationInterface $validation */
+        $validation = $this->builder->getMapper($fqcn)
+            ->map(null, $data);
+
+        if ($validation instanceof AbstractCustomMessageValidation && $message) {
+            $validation->setMessage($message);
+        }
+
+        return $validation;
+    }
 }

src/Mapper/ContentType/Field/BaseField.php

@@ -22,7 +22,6 @@
 use Contentful\Management\Resource\ContentType\Field\RichTextField;
 use Contentful\Management\Resource\ContentType\Field\SymbolField;
 use Contentful\Management\Resource\ContentType\Field\TextField;
-use Contentful\Management\Resource\ContentType\Validation\ValidationInterface;
 
 /**
  * BaseField class.
@@ -56,22 +55,10 @@ public function map($resource, array $data): FieldInterface
             'disabled' => $data['disabled'] ?? null,
             'omitted' => $data['omitted'] ?? null,
             'validations' => isset($data['validations'])
-                ? \array_map([$this, 'mapValidation'], $data['validations'])
+                ? \array_filter(\array_map([$this, 'mapValidation'], $data['validations']))
                 : [],
         ]);
 
         return $field;
     }
-
-    protected function mapValidation(array $data): ValidationInterface
-    {
-        $fqcn = '\\Contentful\\Management\\Mapper\\ContentType\\Validation\\'.\ucfirst(\array_keys($data)[0]).'Validation';
-
-        /** @var ValidationInterface $validation */
-        $validation = $this->builder->getMapper($fqcn)
-            ->map(null, $data)
-        ;
-
-        return $validation;
-    }
 }

src/Mapper/ContentType/Validation/EnabledMarksValidation.php

@@ -24,6 +24,6 @@ class EnabledMarksValidation extends BaseMapper
      */
     public function map($resource, array $data): ResourceClass
     {
-        return new ResourceClass();
+        return new ResourceClass($data['enabledMarks']);
     }
 }

src/Mapper/ContentType/Validation/EnabledNodeTypesValidation.php

@@ -24,6 +24,6 @@ class EnabledNodeTypesValidation extends BaseMapper
      */
     public function map($resource, array $data): ResourceClass
     {
-        return new ResourceClass();
+        return new ResourceClass($data['enabledNodeTypes']);
     }
 }

src/Mapper/ContentType/Validation/NodesValidation.php

@@ -24,6 +24,22 @@ class NodesValidation extends BaseMapper
      */
     public function map($resource, array $data): ResourceClass
     {
-        return new ResourceClass();
+        return new ResourceClass(
+            isset($data['nodes']['asset-hyperlink']) ?
+                \array_map([$this, 'mapValidation'], $data['nodes']['asset-hyperlink']) :
+                [],
+            isset($data['nodes']['embedded-asset-block']) ?
+                \array_map([$this, 'mapValidation'], $data['nodes']['embedded-asset-block']) :
+                [],
+            isset($data['nodes']['embedded-entry-block']) ?
+                \array_map([$this, 'mapValidation'], $data['nodes']['embedded-entry-block']) :
+                [],
+            isset($data['nodes']['embedded-entry-inline']) ?
+                \array_map([$this, 'mapValidation'], $data['nodes']['embedded-entry-inline']) :
+                [],
+            isset($data['nodes']['entry-hyperlink']) ?
+                \array_map([$this, 'mapValidation'], $data['nodes']['entry-hyperlink']) :
+                []
+        );
     }
 }

src/Resource/ContentType/Validation/AbstractCustomMessageValidation.php

@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+namespace Contentful\Management\Resource\ContentType\Validation;
+
+abstract class AbstractCustomMessageValidation
+{
+    /**
+     * @var string|null
+     */
+    private $message;
+
+    public function setMessage(string $message): self
+    {
+        $this->message = $message;
+
+        return $this;
+    }
+
+    public function getMessage(): ?string
+    {
+        return $this->message;
+    }
+
+    public function jsonSerialize(): array
+    {
+        return $this->message ? ['message' => $this->message] : [];
+    }
+}

src/Resource/ContentType/Validation/AssetFileSizeValidation.php

@@ -19,7 +19,7 @@
  * Applicable to:
  * - Link (to assets)
  */
-class AssetFileSizeValidation implements ValidationInterface
+class AssetFileSizeValidation extends AbstractCustomMessageValidation implements ValidationInterface
 {
     /**
      * @var int|null
@@ -100,8 +100,9 @@ public function jsonSerialize(): array
             $data['max'] = $this->max;
         }
 
-        return [
+        return array_merge(
+            parent::jsonSerialize(), [
             'assetFileSize' => $data,
-        ];
+        ]);
     }
 }

src/Resource/ContentType/Validation/AssetImageDimensionsValidation.php

@@ -19,7 +19,7 @@
  * Applicable to:
  * - Link (to image assets)
  */
-class AssetImageDimensionsValidation implements ValidationInterface
+class AssetImageDimensionsValidation extends AbstractCustomMessageValidation implements ValidationInterface
 {
     /**
      * @var int|null
@@ -161,8 +161,11 @@ public function jsonSerialize(): array
             $data['height'] = $heightData;
         }
 
-        return [
-            'assetImageDimensions' => $data,
-        ];
+        return array_merge(
+            parent::jsonSerialize(),
+            [
+                'assetImageDimensions' => $data,
+            ]
+        );
     }
 }

src/Resource/ContentType/Validation/DateRangeValidation.php

@@ -19,7 +19,7 @@
  * Applicable to:
  * - Date
  */
-class DateRangeValidation implements ValidationInterface
+class DateRangeValidation extends AbstractCustomMessageValidation implements ValidationInterface
 {
     /**
      * @var string|null
@@ -97,8 +97,11 @@ public function jsonSerialize(): array
             $data['max'] = $this->max;
         }
 
-        return [
-            'dateRange' => $data,
-        ];
+        return array_merge(
+            parent::jsonSerialize(),
+            [
+                'dateRange' => $data,
+            ]
+        );
     }
 }

src/Resource/ContentType/Validation/EnabledMarksValidation.php

@@ -16,19 +16,41 @@
  */
 class EnabledMarksValidation implements ValidationInterface
 {
+    private const VALID_FIELD_TYPES = ['RichText'];
+
+    /**
+     * @var array
+     */
+    private $enabledMarks;
+
+    public function __construct(array $enabledMarks)
+    {
+        $this->enabledMarks = $enabledMarks;
+    }
+
     /**
      * {@inheritdoc}
      */
     public static function getValidFieldTypes(): array
     {
-        return [];
+        return self::VALID_FIELD_TYPES;
+    }
+
+    public function getEnabledMarks(): array
+    {
+        return $this->enabledMarks;
+    }
+
+    public function setEnabledMarks(array $enabledMarks)
+    {
+        $this->enabledMarks = $enabledMarks;
     }
 
     /**
      * {@inheritdoc}
      */
     public function jsonSerialize()
     {
-        return [];
+        return ['enabledMarks' => $this->enabledMarks];
     }
 }

src/Resource/ContentType/Validation/EnabledNodeTypesValidation.php

@@ -16,19 +16,41 @@
  */
 class EnabledNodeTypesValidation implements ValidationInterface
 {
+    private const VALID_FIELD_TYPES = ['RichText'];
+
+    /**
+     * @var array
+     */
+    private $enabledNodeTypes;
+
+    public function __construct(array $enabledNodeTypes)
+    {
+        $this->enabledNodeTypes = $enabledNodeTypes;
+    }
+
     /**
      * {@inheritdoc}
      */
     public static function getValidFieldTypes(): array
     {
-        return [];
+        return self::VALID_FIELD_TYPES;
+    }
+
+    public function getEnabledNodeTypes(): array
+    {
+        return $this->enabledNodeTypes;
+    }
+
+    public function setEnabledNodeTypes(array $enabledNodeTypes)
+    {
+        $this->enabledNodeTypes = $enabledNodeTypes;
     }
 
     /**
      * {@inheritdoc}
      */
     public function jsonSerialize()
     {
-        return [];
+        return ['enabledNodeTypes' => $this->enabledNodeTypes];
     }
 }

src/Resource/ContentType/Validation/InValidation.php

@@ -22,7 +22,7 @@
  * - Integer
  * - Number
  */
-class InValidation implements ValidationInterface
+class InValidation extends AbstractCustomMessageValidation implements ValidationInterface
 {
     /**
      * @var string[]
@@ -72,8 +72,11 @@ public static function getValidFieldTypes(): array
      */
     public function jsonSerialize(): array
     {
-        return [
-            'in' => $this->values,
-        ];
+        return array_merge(
+            parent::jsonSerialize(),
+            [
+                'in' => $this->values,
+            ]
+        );
     }
 }

src/Resource/ContentType/Validation/LinkContentTypeValidation.php

@@ -11,6 +11,10 @@
 
 namespace Contentful\Management\Resource\ContentType\Validation;
 
+use Contentful\Management\Resource\ContentType\Validation\Nodes\EmbeddedEntryBlockValidationInterface;
+use Contentful\Management\Resource\ContentType\Validation\Nodes\EmbeddedEntryInlineValidationInterface;
+use Contentful\Management\Resource\ContentType\Validation\Nodes\EntryHyperlinkValidationInterface;
+
 /**
  * LinkContentTypeValidation class.
  *
@@ -20,7 +24,10 @@
  * Applicable to:
  * - Link (to entries)
  */
-class LinkContentTypeValidation implements ValidationInterface
+class LinkContentTypeValidation extends AbstractCustomMessageValidation implements ValidationInterface,
+    EntryHyperlinkValidationInterface,
+    EmbeddedEntryBlockValidationInterface,
+    EmbeddedEntryInlineValidationInterface
 {
     /**
      * @var string[]
@@ -70,8 +77,11 @@ public static function getValidFieldTypes(): array
      */
     public function jsonSerialize(): array
     {
-        return [
-            'linkContentType' => $this->contentTypes,
-        ];
+        return array_merge(
+            parent::jsonSerialize(),
+            [
+                'linkContentType' => $this->contentTypes,
+            ]
+        );
     }
 }

src/Resource/ContentType/Validation/LinkMimetypeGroupValidation.php

@@ -20,7 +20,7 @@
  * Applicable to:
  * - Link (to assets)
  */
-class LinkMimetypeGroupValidation implements ValidationInterface
+class LinkMimetypeGroupValidation extends AbstractCustomMessageValidation implements ValidationInterface
 {
     /**
      * @var string[]
@@ -70,8 +70,11 @@ public static function getValidFieldTypes(): array
      */
     public function jsonSerialize(): array
     {
-        return [
-            'linkMimetypeGroup' => $this->mimeTypeGroups,
-        ];
+        return array_merge(
+            parent::jsonSerialize(),
+            [
+                'linkMimetypeGroup' => $this->mimeTypeGroups,
+            ]
+        );
     }
 }

src/Resource/ContentType/Validation/Nodes/AssetHyperlinkValidationInterface.php

@@ -0,0 +1,11 @@
+<?php
+declare(strict_types=1);
+
+namespace Contentful\Management\Resource\ContentType\Validation\Nodes;
+
+use Contentful\Management\Resource\ContentType\Validation\ValidationInterface;
+
+interface AssetHyperlinkValidationInterface extends ValidationInterface
+{
+
+}