From b7ed8ec2468d36d0f072e883dcdda6674b136193 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sat, 27 Mar 2021 12:27:02 +0200
Subject: [PATCH] refactoring

---
 .../Espo/Classes/FieldValidators/BaseType.php | 60 -------------------
 .../FieldValidators/PersonNameType.php        | 17 +++++-
 2 files changed, 15 insertions(+), 62 deletions(-)
 delete mode 100644 application/Espo/Classes/FieldValidators/BaseType.php

diff --git a/application/Espo/Classes/FieldValidators/BaseType.php b/application/Espo/Classes/FieldValidators/BaseType.php
deleted file mode 100644
index 9c81f43f5f..0000000000
--- a/application/Espo/Classes/FieldValidators/BaseType.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/************************************************************************
- * This file is part of EspoCRM.
- *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
- * Website: https://www.espocrm.com
- *
- * EspoCRM is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * EspoCRM is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/
-
-namespace Espo\Classes\FieldValidators;
-
-use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Utils\Metadata,
-    Utils\FieldUtil,
-};
-
-class BaseType
-{
-    protected $metadata;
-
-    protected $fieldUtil;
-
-    public function __construct(Metadata $metadata, FieldUtil $fieldUtil)
-    {
-        $this->metadata = $metadata;
-        $this->fieldUtil = $fieldUtil;
-    }
-
-    protected function getActualAttributeList(Entity $entity, string $field) : array
-    {
-        return $this->fieldUtil->getActualAttributeList($entity->getEntityType(), $field);
-    }
-
-    protected function getMetadata() : Metadata
-    {
-        return $this->metadata;
-    }
-}
diff --git a/application/Espo/Classes/FieldValidators/PersonNameType.php b/application/Espo/Classes/FieldValidators/PersonNameType.php
index 56885e1b75..758a98398f 100644
--- a/application/Espo/Classes/FieldValidators/PersonNameType.php
+++ b/application/Espo/Classes/FieldValidators/PersonNameType.php
@@ -31,13 +31,26 @@ namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
-class PersonNameType extends BaseType
+use Espo\Core\{
+    Utils\FieldUtil,
+};
+
+class PersonNameType
 {
+    private $fieldUtil;
+
+    public function __construct(FieldUtil $fieldUtil)
+    {
+        $this->fieldUtil = $fieldUtil;
+    }
+
     public function checkRequired(Entity $entity, string $field) : bool
     {
         $isEmpty = true;
 
-        foreach ($this->getActualAttributeList($entity, $field) as $attribute) {
+        $attributeList = $this->fieldUtil->getActualAttributeList($entity->getEntityType(), $field);
+
+        foreach ($attributeList as $attribute) {
             if ($attribute === 'salutation' . ucfirst($field)) {
                 continue;
             }