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 @@ -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; }