From e30061e2a0c355b4e0206857826bdfb65055cd5e Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sun, 26 Jul 2020 19:59:28 +0300
Subject: [PATCH] cs fix

---
 .../Espo/Core/FieldValidators/ArrayType.php     | 10 ++++++----
 .../Espo/Core/FieldValidators/BaseType.php      | 17 +++++++++++------
 .../Espo/Core/FieldValidators/CurrencyType.php  |  4 +++-
 .../Espo/Core/FieldValidators/DateType.php      |  6 ++++--
 .../FieldValidators/DatetimeOptionalType.php    |  6 ++++--
 .../Espo/Core/FieldValidators/EmailType.php     |  8 +++++---
 .../Espo/Core/FieldValidators/EnumType.php      |  6 ++++--
 .../Espo/Core/FieldValidators/IntType.php       | 10 ++++++----
 .../Espo/Core/FieldValidators/JsonArrayType.php |  6 ++++--
 .../Core/FieldValidators/LinkMultipleType.php   |  2 +-
 .../Core/FieldValidators/LinkParentType.php     |  2 +-
 .../Espo/Core/FieldValidators/LinkType.php      |  2 +-
 .../Core/FieldValidators/PersonNameType.php     |  2 +-
 .../Espo/Core/FieldValidators/PhoneType.php     |  6 ++++--
 .../Espo/Core/FieldValidators/VarcharType.php   |  8 +++++---
 15 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/application/Espo/Core/FieldValidators/ArrayType.php b/application/Espo/Core/FieldValidators/ArrayType.php
index 84288ff091..de938c0cc5 100644
--- a/application/Espo/Core/FieldValidators/ArrayType.php
+++ b/application/Espo/Core/FieldValidators/ArrayType.php
@@ -29,14 +29,16 @@
 
 namespace Espo\Core\FieldValidators;
 
+use Espo\ORM\Entity;
+
 class ArrayType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    public function checkMaxCount(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMaxCount(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if (!$this->isNotEmpty($entity, $field)) return true;
         $list = $entity->get($field);
@@ -44,7 +46,7 @@ class ArrayType extends BaseType
         return true;
     }
 
-    public function checkArray(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkArray(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if (isset($data->$field) && $data->$field !== null && !is_array($data->$field)) {
             return false;
@@ -53,7 +55,7 @@ class ArrayType extends BaseType
         return true;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         if (!$entity->has($field) || $entity->get($field) === null) return false;
         $list = $entity->get($field);
diff --git a/application/Espo/Core/FieldValidators/BaseType.php b/application/Espo/Core/FieldValidators/BaseType.php
index 15bea8d3ec..c1d2e8f9b6 100644
--- a/application/Espo/Core/FieldValidators/BaseType.php
+++ b/application/Espo/Core/FieldValidators/BaseType.php
@@ -29,14 +29,19 @@
 
 namespace Espo\Core\FieldValidators;
 
-use \Espo\ORM\Entity;
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Utils\Metadata,
+    Utils\FieldManagerUtil,
+};
 
 class BaseType
 {
-    private $metadata;
-    private $fieldManagerUtil;
+    protected $metadata;
+    protected $fieldManagerUtil;
 
-    public function __construct(\Espo\Core\Utils\Metadata $metadata, \Espo\Core\Utils\FieldManagerUtil $fieldManagerUtil)
+    public function __construct(Metadata $metadata, FieldManagerUtil $fieldManagerUtil)
     {
         $this->metadata = $metadata;
         $this->fieldManagerUtil = $fieldManagerUtil;
@@ -47,12 +52,12 @@ class BaseType
         return $this->getFieldManagerUtil()->getActualAttributeList($entity->getEntityType(), $field);
     }
 
-    protected function getMetadata() : \Espo\Core\Utils\Metadata
+    protected function getMetadata() : Metadata
     {
         return $this->metadata;
     }
 
-    protected function getFieldManagerUtil() : \Espo\Core\Utils\FieldManagerUtil
+    protected function getFieldManagerUtil() : FieldManagerUtil
     {
         return $this->fieldManagerUtil;
     }
diff --git a/application/Espo/Core/FieldValidators/CurrencyType.php b/application/Espo/Core/FieldValidators/CurrencyType.php
index 14ae27fc12..5d0adc8211 100644
--- a/application/Espo/Core/FieldValidators/CurrencyType.php
+++ b/application/Espo/Core/FieldValidators/CurrencyType.php
@@ -29,9 +29,11 @@
 
 namespace Espo\Core\FieldValidators;
 
+use Espo\ORM\Entity;
+
 class CurrencyType extends FloatType
 {
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return
             $entity->has($field) && $entity->get($field) !== null &&
diff --git a/application/Espo/Core/FieldValidators/DateType.php b/application/Espo/Core/FieldValidators/DateType.php
index 2352983173..9c730778e5 100644
--- a/application/Espo/Core/FieldValidators/DateType.php
+++ b/application/Espo/Core/FieldValidators/DateType.php
@@ -29,14 +29,16 @@
 
 namespace Espo\Core\FieldValidators;
 
+use Espo\ORM\Entity;
+
 class DateType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return $entity->has($field) && $entity->get($field) !== null;
     }
diff --git a/application/Espo/Core/FieldValidators/DatetimeOptionalType.php b/application/Espo/Core/FieldValidators/DatetimeOptionalType.php
index 8a71a9b67c..e6e5e75d62 100644
--- a/application/Espo/Core/FieldValidators/DatetimeOptionalType.php
+++ b/application/Espo/Core/FieldValidators/DatetimeOptionalType.php
@@ -29,14 +29,16 @@
 
 namespace Espo\Core\FieldValidators;
 
+use Espo\ORM\Entity;
+
 class DatetimeOptionalType extends DatetimeType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         if ($entity->has($field) && $entity->get($field) !== null) return true;
         if ($entity->has($field . 'Date') && $entity->get($field . 'Date') !== null) return true;
diff --git a/application/Espo/Core/FieldValidators/EmailType.php b/application/Espo/Core/FieldValidators/EmailType.php
index 752463d253..8f3212988d 100644
--- a/application/Espo/Core/FieldValidators/EmailType.php
+++ b/application/Espo/Core/FieldValidators/EmailType.php
@@ -29,9 +29,11 @@
 
 namespace Espo\Core\FieldValidators;
 
+use Espo\ORM\Entity;
+
 class EmailType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if ($this->isNotEmpty($entity, $field)) return true;
 
@@ -45,7 +47,7 @@ class EmailType extends BaseType
         return false;
     }
 
-    public function checkEmailAddress(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkEmailAddress(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if ($this->isNotEmpty($entity, $field)) {
             $address = $entity->get($field);
@@ -68,7 +70,7 @@ class EmailType extends BaseType
         return true;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return $entity->has($field) && $entity->get($field) !== '' && $entity->get($field) !== null;
     }
diff --git a/application/Espo/Core/FieldValidators/EnumType.php b/application/Espo/Core/FieldValidators/EnumType.php
index f6a954fa98..9975f7d327 100644
--- a/application/Espo/Core/FieldValidators/EnumType.php
+++ b/application/Espo/Core/FieldValidators/EnumType.php
@@ -29,14 +29,16 @@
 
 namespace Espo\Core\FieldValidators;
 
+use Espo\ORM\Entity;
+
 class EnumType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return $entity->has($field) && $entity->get($field) !== null;
     }
diff --git a/application/Espo/Core/FieldValidators/IntType.php b/application/Espo/Core/FieldValidators/IntType.php
index 4c1ad42386..05f960e583 100644
--- a/application/Espo/Core/FieldValidators/IntType.php
+++ b/application/Espo/Core/FieldValidators/IntType.php
@@ -29,28 +29,30 @@
 
 namespace Espo\Core\FieldValidators;
 
+use Espo\ORM\Entity;
+
 class IntType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    public function checkMax(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMax(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if (!$this->isNotEmpty($entity, $field)) return true;
         if ($entity->get($field) > $validationValue) return false;
         return true;
     }
 
-    public function checkMin(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMin(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if (!$this->isNotEmpty($entity, $field)) return true;
         if ($entity->get($field) < $validationValue) return false;
         return true;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return $entity->has($field) && $entity->get($field) !== null;
     }
diff --git a/application/Espo/Core/FieldValidators/JsonArrayType.php b/application/Espo/Core/FieldValidators/JsonArrayType.php
index c33df61eb6..0373b01156 100644
--- a/application/Espo/Core/FieldValidators/JsonArrayType.php
+++ b/application/Espo/Core/FieldValidators/JsonArrayType.php
@@ -29,16 +29,18 @@
 
 namespace Espo\Core\FieldValidators;
 
+use Espo\ORM\Entity;
+
 class JsonArrayType extends BaseType
 {
-    public function checkArray(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkArray(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if (!$entity->has($field) || $entity->get($field) === null) return true;
 
         return is_array($entity->get($field));
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         if (!$entity->has($field) || $entity->get($field) === null) return false;
         $list = $entity->get($field);
diff --git a/application/Espo/Core/FieldValidators/LinkMultipleType.php b/application/Espo/Core/FieldValidators/LinkMultipleType.php
index ba14e6a980..268fd97470 100644
--- a/application/Espo/Core/FieldValidators/LinkMultipleType.php
+++ b/application/Espo/Core/FieldValidators/LinkMultipleType.php
@@ -31,7 +31,7 @@ namespace Espo\Core\FieldValidators;
 
 class LinkMultipleType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return count($entity->getLinkMultipleIdList($field)) > 0;
     }
diff --git a/application/Espo/Core/FieldValidators/LinkParentType.php b/application/Espo/Core/FieldValidators/LinkParentType.php
index d7d0022526..52cd157470 100644
--- a/application/Espo/Core/FieldValidators/LinkParentType.php
+++ b/application/Espo/Core/FieldValidators/LinkParentType.php
@@ -31,7 +31,7 @@ namespace Espo\Core\FieldValidators;
 
 class LinkParentType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         $idAttribute = $field . 'Id';
         $typeAttribute = $field . 'Type';
diff --git a/application/Espo/Core/FieldValidators/LinkType.php b/application/Espo/Core/FieldValidators/LinkType.php
index afc0ae1a12..4578476ffe 100644
--- a/application/Espo/Core/FieldValidators/LinkType.php
+++ b/application/Espo/Core/FieldValidators/LinkType.php
@@ -31,7 +31,7 @@ namespace Espo\Core\FieldValidators;
 
 class LinkType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         $idAttribute = $field . 'Id';
 
diff --git a/application/Espo/Core/FieldValidators/PersonNameType.php b/application/Espo/Core/FieldValidators/PersonNameType.php
index 463ef99d89..733de25179 100644
--- a/application/Espo/Core/FieldValidators/PersonNameType.php
+++ b/application/Espo/Core/FieldValidators/PersonNameType.php
@@ -31,7 +31,7 @@ namespace Espo\Core\FieldValidators;
 
 class PersonNameType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         $isEmpty = true;
         foreach ($this->getActualAttributeList($entity, $field) as $attribute) {
diff --git a/application/Espo/Core/FieldValidators/PhoneType.php b/application/Espo/Core/FieldValidators/PhoneType.php
index 94ffc55679..bce06bac57 100644
--- a/application/Espo/Core/FieldValidators/PhoneType.php
+++ b/application/Espo/Core/FieldValidators/PhoneType.php
@@ -29,9 +29,11 @@
 
 namespace Espo\Core\FieldValidators;
 
+use Espo\ORM\Entity;
+
 class PhoneType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if ($this->isNotEmpty($entity, $field)) return true;
 
@@ -45,7 +47,7 @@ class PhoneType extends BaseType
         return false;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return $entity->has($field) && $entity->get($field) !== '' && $entity->get($field) !== null;
     }
diff --git a/application/Espo/Core/FieldValidators/VarcharType.php b/application/Espo/Core/FieldValidators/VarcharType.php
index 4a804e8a65..69e8a41f81 100644
--- a/application/Espo/Core/FieldValidators/VarcharType.php
+++ b/application/Espo/Core/FieldValidators/VarcharType.php
@@ -29,14 +29,16 @@
 
 namespace Espo\Core\FieldValidators;
 
+use Espo\ORM\Entity;
+
 class VarcharType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    public function checkMaxLength(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMaxLength(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if ($this->isNotEmpty($entity, $field)) {
             $value = $entity->get($field);
@@ -47,7 +49,7 @@ class VarcharType extends BaseType
         return true;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return $entity->has($field) && $entity->get($field) !== '' && $entity->get($field) !== null;
     }