From 5aa4c8f06982ac5ab7d9d05911de1887064ca1ac Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 9 Nov 2023 16:26:49 +0200 Subject: [PATCH] cs --- .../Database/Orm/FieldConverters/Email.php | 40 ++++++++--------- .../Database/Orm/FieldConverters/Phone.php | 43 ++++++++++--------- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/application/Espo/Core/Utils/Database/Orm/FieldConverters/Email.php b/application/Espo/Core/Utils/Database/Orm/FieldConverters/Email.php index a0426de664..8ce74d54af 100644 --- a/application/Espo/Core/Utils/Database/Orm/FieldConverters/Email.php +++ b/application/Espo/Core/Utils/Database/Orm/FieldConverters/Email.php @@ -46,8 +46,8 @@ class Email implements FieldConverter { $name = $fieldDefs->getName(); - $foreignJoinAlias = "{$name}{$entityType}{alias}Foreign"; - $foreignJoinMiddleAlias = "{$name}{$entityType}{alias}ForeignMiddle"; + $foreignJoinAlias = "$name$entityType{alias}Foreign"; + $foreignJoinMiddleAlias = "$name$entityType{alias}ForeignMiddle"; $emailAddressDefs = AttributeDefs ::create($name) @@ -125,23 +125,23 @@ class Email implements FieldConverter 'leftJoins' => [['emailAddresses', 'emailAddresses', ['primary' => true]]], ], 'selectForeign' => [ - "select" => "{$foreignJoinAlias}.name", + "select" => "$foreignJoinAlias.name", 'leftJoins' => [ [ 'EntityEmailAddress', $foreignJoinMiddleAlias, [ - "{$foreignJoinMiddleAlias}.entityId:" => "{alias}.id", - "{$foreignJoinMiddleAlias}.primary" => true, - "{$foreignJoinMiddleAlias}.deleted" => false, + "$foreignJoinMiddleAlias.entityId:" => "{alias}.id", + "$foreignJoinMiddleAlias.primary" => true, + "$foreignJoinMiddleAlias.deleted" => false, ] ], [ EmailAddress::ENTITY_TYPE, $foreignJoinAlias, [ - "{$foreignJoinAlias}.id:" => "{$foreignJoinMiddleAlias}.emailAddressId", - "{$foreignJoinAlias}.deleted" => false, + "$foreignJoinAlias.id:" => "$foreignJoinMiddleAlias.emailAddressId", + "$foreignJoinAlias.deleted" => false, ] ] ], @@ -258,23 +258,23 @@ class Email implements FieldConverter 'leftJoins' => [['emailAddresses', 'emailAddresses', ['primary' => true]]], ], 'selectForeign' => [ - 'select' => "{$foreignJoinAlias}.optOut", + 'select' => "$foreignJoinAlias.optOut", 'leftJoins' => [ [ 'EntityEmailAddress', $foreignJoinMiddleAlias, [ - "{$foreignJoinMiddleAlias}.entityId:" => "{alias}.id", - "{$foreignJoinMiddleAlias}.primary" => true, - "{$foreignJoinMiddleAlias}.deleted" => false, + "$foreignJoinMiddleAlias.entityId:" => "{alias}.id", + "$foreignJoinMiddleAlias.primary" => true, + "$foreignJoinMiddleAlias.deleted" => false, ] ], [ EmailAddress::ENTITY_TYPE, $foreignJoinAlias, [ - "{$foreignJoinAlias}.id:" => "{$foreignJoinMiddleAlias}.emailAddressId", - "{$foreignJoinAlias}.deleted" => false, + "$foreignJoinAlias.id:" => "$foreignJoinMiddleAlias.emailAddressId", + "$foreignJoinAlias.deleted" => false, ] ] ], @@ -318,23 +318,23 @@ class Email implements FieldConverter 'leftJoins' => [['emailAddresses', 'emailAddresses', ['primary' => true]]], ], 'selectForeign' => [ - 'select' => "{$foreignJoinAlias}.invalid", + 'select' => "$foreignJoinAlias.invalid", 'leftJoins' => [ [ 'EntityEmailAddress', $foreignJoinMiddleAlias, [ - "{$foreignJoinMiddleAlias}.entityId:" => "{alias}.id", - "{$foreignJoinMiddleAlias}.primary" => true, - "{$foreignJoinMiddleAlias}.deleted" => false, + "$foreignJoinMiddleAlias.entityId:" => "{alias}.id", + "$foreignJoinMiddleAlias.primary" => true, + "$foreignJoinMiddleAlias.deleted" => false, ] ], [ EmailAddress::ENTITY_TYPE, $foreignJoinAlias, [ - "{$foreignJoinAlias}.id:" => "{$foreignJoinMiddleAlias}.emailAddressId", - "{$foreignJoinAlias}.deleted" => false, + "$foreignJoinAlias.id:" => "$foreignJoinMiddleAlias.emailAddressId", + "$foreignJoinAlias.deleted" => false, ] ] ], diff --git a/application/Espo/Core/Utils/Database/Orm/FieldConverters/Phone.php b/application/Espo/Core/Utils/Database/Orm/FieldConverters/Phone.php index 692c90b263..dfd176cb49 100644 --- a/application/Espo/Core/Utils/Database/Orm/FieldConverters/Phone.php +++ b/application/Espo/Core/Utils/Database/Orm/FieldConverters/Phone.php @@ -38,6 +38,9 @@ use Espo\ORM\Defs\FieldDefs; use Espo\ORM\Type\AttributeType; use Espo\ORM\Type\RelationType; +/** + * @noinspection PhpUnused + */ class Phone implements FieldConverter { private const COLUMN_ENTITY_TYPE_LENGTH = 100; @@ -46,8 +49,8 @@ class Phone implements FieldConverter { $name = $fieldDefs->getName(); - $foreignJoinAlias = "{$name}{$entityType}{alias}Foreign"; - $foreignJoinMiddleAlias = "{$name}{$entityType}{alias}ForeignMiddle"; + $foreignJoinAlias = "$name$entityType{alias}Foreign"; + $foreignJoinMiddleAlias = "$name$entityType{alias}ForeignMiddle"; $emailAddressDefs = AttributeDefs ::create($name) @@ -134,23 +137,23 @@ class Phone implements FieldConverter 'leftJoins' => [['phoneNumbers', 'phoneNumbers', ['primary' => true]]], ], 'selectForeign' => [ - "select" => "{$foreignJoinAlias}.name", + "select" => "$foreignJoinAlias.name", 'leftJoins' => [ [ 'EntityPhoneNumber', $foreignJoinMiddleAlias, [ - "{$foreignJoinMiddleAlias}.entityId:" => "{alias}.id", - "{$foreignJoinMiddleAlias}.primary" => true, - "{$foreignJoinMiddleAlias}.deleted" => false, + "$foreignJoinMiddleAlias.entityId:" => "{alias}.id", + "$foreignJoinMiddleAlias.primary" => true, + "$foreignJoinMiddleAlias.deleted" => false, ] ], [ PhoneNumber::ENTITY_TYPE, $foreignJoinAlias, [ - "{$foreignJoinAlias}.id:" => "{$foreignJoinMiddleAlias}.phoneNumberId", - "{$foreignJoinAlias}.deleted" => false, + "$foreignJoinAlias.id:" => "$foreignJoinMiddleAlias.phoneNumberId", + "$foreignJoinAlias.deleted" => false, ] ] ], @@ -267,23 +270,23 @@ class Phone implements FieldConverter 'leftJoins' => [['phoneNumbers', 'phoneNumbers', ['primary' => true]]], ], 'selectForeign' => [ - 'select' => "{$foreignJoinAlias}.optOut", + 'select' => "$foreignJoinAlias.optOut", 'leftJoins' => [ [ 'EntityPhoneNumber', $foreignJoinMiddleAlias, [ - "{$foreignJoinMiddleAlias}.entityId:" => "{alias}.id", - "{$foreignJoinMiddleAlias}.primary" => true, - "{$foreignJoinMiddleAlias}.deleted" => false, + "$foreignJoinMiddleAlias.entityId:" => "{alias}.id", + "$foreignJoinMiddleAlias.primary" => true, + "$foreignJoinMiddleAlias.deleted" => false, ] ], [ PhoneNumber::ENTITY_TYPE, $foreignJoinAlias, [ - "{$foreignJoinAlias}.id:" => "{$foreignJoinMiddleAlias}.phoneNumberId", - "{$foreignJoinAlias}.deleted" => false, + "$foreignJoinAlias.id:" => "$foreignJoinMiddleAlias.phoneNumberId", + "$foreignJoinAlias.deleted" => false, ] ] ], @@ -327,23 +330,23 @@ class Phone implements FieldConverter 'leftJoins' => [['phoneNumbers', 'phoneNumbers', ['primary' => true]]], ], 'selectForeign' => [ - 'select' => "{$foreignJoinAlias}.invalid", + 'select' => "$foreignJoinAlias.invalid", 'leftJoins' => [ [ 'EntityPhoneNumber', $foreignJoinMiddleAlias, [ - "{$foreignJoinMiddleAlias}.entityId:" => "{alias}.id", - "{$foreignJoinMiddleAlias}.primary" => true, - "{$foreignJoinMiddleAlias}.deleted" => false, + "$foreignJoinMiddleAlias.entityId:" => "{alias}.id", + "$foreignJoinMiddleAlias.primary" => true, + "$foreignJoinMiddleAlias.deleted" => false, ] ], [ PhoneNumber::ENTITY_TYPE, $foreignJoinAlias, [ - "{$foreignJoinAlias}.id:" => "{$foreignJoinMiddleAlias}.phoneNumberId", - "{$foreignJoinAlias}.deleted" => false, + "$foreignJoinAlias.id:" => "$foreignJoinMiddleAlias.phoneNumberId", + "$foreignJoinAlias.deleted" => false, ] ] ],