From 7b9c6cdb3f45df342e81bde809bf1e026ab285db Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 9 Dec 2022 13:17:43 +0200
Subject: [PATCH] ref

---
 .../EmailAddress/EmailAddressGroupFactory.php | 29 ++++++++-----------
 .../PhoneNumber/PhoneNumberGroupFactory.php   | 29 ++++++++-----------
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/application/Espo/Core/Field/EmailAddress/EmailAddressGroupFactory.php b/application/Espo/Core/Field/EmailAddress/EmailAddressGroupFactory.php
index 6cce776cf2..c40a550c6d 100644
--- a/application/Espo/Core/Field/EmailAddress/EmailAddressGroupFactory.php
+++ b/application/Espo/Core/Field/EmailAddress/EmailAddressGroupFactory.php
@@ -29,21 +29,19 @@
 
 namespace Espo\Core\Field\EmailAddress;
 
+use Espo\Entities\EmailAddress as EmailAddressEntity;
 use Espo\Repositories\EmailAddress as Repository;
 
-use Espo\ORM\{
-    EntityManager,
-    Entity,
-    Value\ValueFactory,
-};
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Value\ValueFactory;
 
-use Espo\Core\{
-    Utils\Metadata,
-    Field\EmailAddressGroup,
-    Field\EmailAddress,
-};
+use Espo\Core\Field\EmailAddress;
+use Espo\Core\Field\EmailAddressGroup;
+use Espo\Core\Utils\Metadata;
 
 use RuntimeException;
+use stdClass;
 
 /**
  * An email address group factory.
@@ -51,7 +49,6 @@ use RuntimeException;
 class EmailAddressGroupFactory implements ValueFactory
 {
     private Metadata $metadata;
-
     private EntityManager $entityManager;
 
     /**
@@ -65,9 +62,7 @@ class EmailAddressGroupFactory implements ValueFactory
 
     public function isCreatableFromEntity(Entity $entity, string $field): bool
     {
-        $type = $this->metadata->get([
-            'entityDefs', $entity->getEntityType(), 'fields', $field, 'type'
-        ]);
+        $type = $this->metadata->get(['entityDefs', $entity->getEntityType(), 'fields', $field, 'type']);
 
         if ($type !== 'email') {
             return false;
@@ -102,7 +97,7 @@ class EmailAddressGroupFactory implements ValueFactory
 
         if (!$dataList) {
             /** @var Repository $repository */
-            $repository = $this->entityManager->getRepository('EmailAddress');
+            $repository = $this->entityManager->getRepository(EmailAddressEntity::ENTITY_TYPE);
 
             $dataList = $repository->getEmailAddressData($entity);
         }
@@ -135,8 +130,8 @@ class EmailAddressGroupFactory implements ValueFactory
     }
 
     /**
-     * @param array<int,array<string,mixed>|\stdClass> $dataList
-     * @return \stdClass[]
+     * @param array<int,array<string,mixed>|stdClass> $dataList
+     * @return stdClass[]
      */
     private function sanitizeDataList(array $dataList): array
     {
diff --git a/application/Espo/Core/Field/PhoneNumber/PhoneNumberGroupFactory.php b/application/Espo/Core/Field/PhoneNumber/PhoneNumberGroupFactory.php
index 79d5b2b2f3..bad160efde 100644
--- a/application/Espo/Core/Field/PhoneNumber/PhoneNumberGroupFactory.php
+++ b/application/Espo/Core/Field/PhoneNumber/PhoneNumberGroupFactory.php
@@ -29,21 +29,19 @@
 
 namespace Espo\Core\Field\PhoneNumber;
 
+use Espo\Entities\PhoneNumber as PhoneNumberEntity;
 use Espo\Repositories\PhoneNumber as Repository;
 
-use Espo\ORM\{
-    EntityManager,
-    Entity,
-    Value\ValueFactory,
-};
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Value\ValueFactory;
 
-use Espo\Core\{
-    Utils\Metadata,
-    Field\PhoneNumberGroup,
-    Field\PhoneNumber,
-};
+use Espo\Core\Field\PhoneNumber;
+use Espo\Core\Field\PhoneNumberGroup;
+use Espo\Core\Utils\Metadata;
 
 use RuntimeException;
+use stdClass;
 
 /**
  * A phone number group factory.
@@ -51,7 +49,6 @@ use RuntimeException;
 class PhoneNumberGroupFactory implements ValueFactory
 {
     private Metadata $metadata;
-
     private EntityManager $entityManager;
 
     /**
@@ -65,9 +62,7 @@ class PhoneNumberGroupFactory implements ValueFactory
 
     public function isCreatableFromEntity(Entity $entity, string $field): bool
     {
-        $type = $this->metadata->get([
-            'entityDefs', $entity->getEntityType(), 'fields', $field, 'type'
-        ]);
+        $type = $this->metadata->get(['entityDefs', $entity->getEntityType(), 'fields', $field, 'type']);
 
         if ($type !== 'phone') {
             return false;
@@ -102,7 +97,7 @@ class PhoneNumberGroupFactory implements ValueFactory
 
         if (!$dataList) {
             /** @var Repository $repository */
-            $repository = $this->entityManager->getRepository('PhoneNumber');
+            $repository = $this->entityManager->getRepository(PhoneNumberEntity::ENTITY_TYPE);
 
             $dataList = $repository->getPhoneNumberData($entity);
         }
@@ -139,8 +134,8 @@ class PhoneNumberGroupFactory implements ValueFactory
     }
 
     /**
-     * @param array<int,array<string,mixed>|\stdClass> $dataList
-     * @return \stdClass[]
+     * @param array<int,array<string,mixed>|stdClass> $dataList
+     * @return stdClass[]
      */
     private function sanitizeDataList(array $dataList): array
     {