add character count options to text elements, allow nameExpression in…

… CollectionElement

src/Element/AbstractTextElement.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * @link https://github.com/ixocreate
+ * @copyright IXOLIT GmbH
+ * @license MIT License
+ */
+
+declare(strict_types=1);
+
+namespace Ixocreate\Schema\Element;
+
+abstract class AbstractTextElement extends AbstractSingleElement
+{
+    /** @var bool */
+    protected $characterCount = false;
+
+    /** @var array */
+    protected $characterBoundaries = null;
+
+    /**
+     * @return bool
+     */
+    public function characterCount(): bool
+    {
+        return $this->characterCount;
+    }
+
+    public function withCharacterCount(bool $characterCount): AbstractTextElement
+    {
+        $element = clone $this;
+        $element->characterCount = $characterCount;
+
+        return $element;
+    }
+
+    /**
+     * @return array
+     */
+    public function characterBoundaries(): ?array
+    {
+        return $this->characterBoundaries;
+    }
+
+    public function withCharacterBoundaries(?int $min, ?int $max): AbstractTextElement
+    {
+        $element = clone $this;
+        $element->characterBoundaries = [
+            'min' => $min,
+            'max' => $max,
+        ];
+
+        return $element;
+    }
+
+    public function jsonSerialize()
+    {
+        $array = parent::jsonSerialize();
+        $array['characterCount'] = $this->characterCount;
+        $array['characterBoundaries'] = $this->characterBoundaries;
+
+        return $array;
+    }
+}

src/Element/CollectionElement.php

@@ -114,14 +114,20 @@ public function jsonSerialize()
      * @param string $name
      * @param string $label
      * @param SchemaInterface $schema
+     * @param string $nameExpression
      * @throws \Exception
      * @return CollectionElement
      */
-    public function addCollectionElement(string $name, string $label, SchemaInterface $schema): CollectionElement
+    public function addCollectionElement(string $name, string $label, SchemaInterface $schema, string $nameExpression = ''): CollectionElement
     {
         $group = $this->builder->create(GroupElement::class, $name);
         $group = $group->withLabel($label);
         $group = $group->withElements($schema->elements());
+
+        if ($nameExpression != '') {
+            $group = $group->withNameExpression($nameExpression);
+        }
+
         return $this->withAddedElement($group);
     }
 }

src/Element/GroupElement.php

@@ -21,7 +21,7 @@ final class GroupElement extends AbstractGroup implements StructuralGroupingInte
     /**
      * @var string
      */
-    private $nameExpression = "";
+    private $nameExpression = '';
 
     /**
      * @return string

src/Element/HtmlElement.php

@@ -11,7 +11,7 @@
 
 use Ixocreate\Schema\Type\HtmlType;
 
-final class HtmlElement extends AbstractSingleElement
+final class HtmlElement extends AbstractTextElement
 {
     public function type(): string
     {

src/Element/TextElement.php

@@ -11,7 +11,7 @@
 
 use Ixocreate\Schema\Type\TypeInterface;
 
-final class TextElement extends AbstractSingleElement
+final class TextElement extends AbstractTextElement
 {
     public function type(): string
     {

src/Element/TextareaElement.php

@@ -11,7 +11,7 @@
 
 use Ixocreate\Schema\Type\TypeInterface;
 
-final class TextareaElement extends AbstractSingleElement
+final class TextareaElement extends AbstractTextElement
 {
     public function type(): string
     {