From ed867d1b958b6664c8966e5b5aa34f4810172b1f Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Tue, 28 Feb 2023 10:37:06 +0200
Subject: [PATCH] array validation max item length rename

---
 .idea/codeStyles/Project.xml                    |  5 +++++
 .../Espo/Classes/FieldValidators/ArrayType.php  | 17 +++++------------
 .../Espo/Resources/metadata/fields/array.json   |  4 ++--
 .../Resources/metadata/fields/multiEnum.json    |  4 ++--
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a0f2edf148..838a8f76af 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -6,6 +6,11 @@
       <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
       <option name="FORCE_EMPTY_METHODS_IN_ONE_LINE" value="true" />
     </PHPCodeStyleSettings>
+    <codeStyleSettings language="JSON">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="PHP">
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
       <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
diff --git a/application/Espo/Classes/FieldValidators/ArrayType.php b/application/Espo/Classes/FieldValidators/ArrayType.php
index 02c3e079ce..47428a750a 100644
--- a/application/Espo/Classes/FieldValidators/ArrayType.php
+++ b/application/Espo/Classes/FieldValidators/ArrayType.php
@@ -38,17 +38,10 @@ use stdClass;
 
 class ArrayType
 {
-    private Metadata $metadata;
+    private const DEFAULT_MAX_ITEM_LENGTH = 100;
 
-    private Defs $defs;
-
-    private const DEFAULT_MAX_LENGTH = 100;
-
-    public function __construct(Metadata $metadata, Defs $defs)
-    {
-        $this->metadata = $metadata;
-        $this->defs = $defs;
-    }
+    public function __construct(private Metadata $metadata, private Defs $defs)
+    {}
 
     public function checkRequired(Entity $entity, string $field): bool
     {
@@ -181,9 +174,9 @@ class ArrayType
         return false;
     }
 
-    public function checkMaxLength(Entity $entity, string $field, ?int $validationValue): bool
+    public function checkMaxItemLength(Entity $entity, string $field, ?int $validationValue): bool
     {
-        $maxLength = $validationValue ?? self::DEFAULT_MAX_LENGTH;
+        $maxLength = $validationValue ?? self::DEFAULT_MAX_ITEM_LENGTH;
 
         /** @var string[] $value */
         $value = $entity->get($field) ?? [];
diff --git a/application/Espo/Resources/metadata/fields/array.json b/application/Espo/Resources/metadata/fields/array.json
index 46d84442d0..27cdc410e9 100644
--- a/application/Espo/Resources/metadata/fields/array.json
+++ b/application/Espo/Resources/metadata/fields/array.json
@@ -63,7 +63,7 @@
         "valid",
         "required",
         "maxCount",
-        "maxLength",
+        "maxItemLength",
         "pattern",
         "noEmptyString"
     ],
@@ -71,7 +71,7 @@
         "array",
         "arrayOfString",
         "valid",
-        "maxLength"
+        "maxItemLength"
     ],
     "filter": true,
     "notCreatable": false,
diff --git a/application/Espo/Resources/metadata/fields/multiEnum.json b/application/Espo/Resources/metadata/fields/multiEnum.json
index 3880ae1dff..a1993a40c9 100644
--- a/application/Espo/Resources/metadata/fields/multiEnum.json
+++ b/application/Espo/Resources/metadata/fields/multiEnum.json
@@ -70,7 +70,7 @@
         "valid",
         "required",
         "maxCount",
-        "maxLength",
+        "maxItemLength",
         "pattern",
         "noEmptyString"
     ],
@@ -78,7 +78,7 @@
         "array",
         "arrayOfString",
         "valid",
-        "maxLength",
+        "maxItemLength",
         "noEmptyString"
     ],
     "filter": true,