espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ref

Browse Source
This commit is contained in:
Yuri Kuznetsov
2022-12-09 13:17:43 +02:00
parent 32ea4dae9d
commit 7b9c6cdb3f
2 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Field/EmailAddress/EmailAddressGroupFactory.php
+12 -17
View File
@@ -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
{
application/Espo/Core/Field/PhoneNumber/PhoneNumberGroupFactory.php
+12 -17
View File
@@ -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
{