From fb94597409e29b165f5b1f287e0f09df46df6d72 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 29 Apr 2021 11:47:34 +0300 Subject: [PATCH] field processing fix --- .../Espo/Classes/FieldProcessing/Email/AddressDataLoader.php | 3 ++- .../Espo/Classes/FieldProcessing/Email/StringDataLoader.php | 3 ++- .../Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php | 3 ++- .../Espo/Classes/FieldProcessing/Import/CountsLoader.php | 3 ++- .../Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php | 3 ++- application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php | 3 ++- .../Espo/Classes/FieldProcessing/User/LastAccessLoader.php | 3 ++- application/Espo/Core/FieldProcessing/EmailAddress/Loader.php | 3 ++- application/Espo/Core/FieldProcessing/EmailAddress/Saver.php | 3 ++- application/Espo/Core/FieldProcessing/File/Saver.php | 3 ++- application/Espo/Core/FieldProcessing/Link/HasOneLoader.php | 3 ++- application/Espo/Core/FieldProcessing/Link/NotJoinedLoader.php | 3 ++- .../Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php | 3 ++- application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php | 3 ++- application/Espo/Core/FieldProcessing/LinkParent/Loader.php | 3 ++- .../Espo/Core/FieldProcessing/LinkParent/TargetLoader.php | 3 ++- application/Espo/Core/FieldProcessing/Loader.php | 2 +- application/Espo/Core/FieldProcessing/MultiEnum/Saver.php | 3 ++- application/Espo/Core/FieldProcessing/PhoneNumber/Loader.php | 3 ++- application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php | 3 ++- .../Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php | 3 ++- application/Espo/Core/FieldProcessing/Relation/Saver.php | 3 ++- application/Espo/Core/FieldProcessing/Reminder/Loader.php | 3 ++- application/Espo/Core/FieldProcessing/Reminder/Saver.php | 3 ++- application/Espo/Core/FieldProcessing/Saver.php | 2 +- .../Espo/Core/FieldProcessing/Stream/FollowersLoader.php | 3 ++- application/Espo/Core/FieldProcessing/Wysiwyg/Saver.php | 3 ++- .../Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php | 3 ++- .../Crm/Classes/FieldProcessing/Campaign/StatsLoader.php | 3 ++- .../Classes/FieldProcessing/TargetList/EntryCountLoader.php | 3 ++- .../Classes/FieldProcessing/TargetList/OptedOutCountLoader.php | 3 ++- 31 files changed, 60 insertions(+), 31 deletions(-) diff --git a/application/Espo/Classes/FieldProcessing/Email/AddressDataLoader.php b/application/Espo/Classes/FieldProcessing/Email/AddressDataLoader.php index 2531b9d55d..67dbb50eec 100644 --- a/application/Espo/Classes/FieldProcessing/Email/AddressDataLoader.php +++ b/application/Espo/Classes/FieldProcessing/Email/AddressDataLoader.php @@ -29,10 +29,11 @@ namespace Espo\Classes\FieldProcessing\Email; +use Espo\ORM\Entity; + use Espo\Core\{ FieldProcessing\Loader, FieldProcessing\LoaderParams, - ORM\Entity, ORM\EntityManager, }; diff --git a/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php b/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php index ed32e2cf74..93bed89bc2 100644 --- a/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php +++ b/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php @@ -29,10 +29,11 @@ namespace Espo\Classes\FieldProcessing\Email; +use Espo\ORM\Entity; + use Espo\Core\{ FieldProcessing\Loader, FieldProcessing\LoaderParams, - ORM\Entity, ORM\EntityManager, }; diff --git a/application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php b/application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php index 22d612165d..a557341cdd 100644 --- a/application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php +++ b/application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php @@ -29,10 +29,11 @@ namespace Espo\Classes\FieldProcessing\Email; +use Espo\ORM\Entity; + use Espo\Core\{ FieldProcessing\Loader, FieldProcessing\LoaderParams, - ORM\Entity, ORM\EntityManager, }; diff --git a/application/Espo/Classes/FieldProcessing/Import/CountsLoader.php b/application/Espo/Classes/FieldProcessing/Import/CountsLoader.php index 7cda12d35e..20b9d40de3 100644 --- a/application/Espo/Classes/FieldProcessing/Import/CountsLoader.php +++ b/application/Espo/Classes/FieldProcessing/Import/CountsLoader.php @@ -29,10 +29,11 @@ namespace Espo\Classes\FieldProcessing\Import; +use Espo\ORM\Entity; + use Espo\Core\{ FieldProcessing\Loader, FieldProcessing\LoaderParams, - ORM\Entity, ORM\EntityManager, }; diff --git a/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php b/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php index 7eea6c2bcf..d4aa98cd14 100644 --- a/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php +++ b/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php @@ -29,10 +29,11 @@ namespace Espo\Classes\FieldProcessing\Note; +use Espo\ORM\Entity; + use Espo\Core\{ FieldProcessing\Loader, FieldProcessing\LoaderParams, - ORM\Entity, }; use Espo\Entities\Note; diff --git a/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php b/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php index 5eb24a2cf4..decb08e75b 100644 --- a/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php +++ b/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php @@ -29,10 +29,11 @@ namespace Espo\Classes\FieldProcessing\Portal; +use Espo\ORM\Entity; + use Espo\Core\{ FieldProcessing\Loader, FieldProcessing\LoaderParams, - ORM\Entity, ORM\EntityManager, }; diff --git a/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php b/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php index 76ab2146a9..4ff90d177b 100644 --- a/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php +++ b/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php @@ -29,10 +29,11 @@ namespace Espo\Classes\FieldProcessing\User; +use Espo\ORM\Entity; + use Espo\Core\{ FieldProcessing\Loader, FieldProcessing\LoaderParams, - ORM\Entity, ORM\EntityManager, Acl, Acl\Table, diff --git a/application/Espo/Core/FieldProcessing/EmailAddress/Loader.php b/application/Espo/Core/FieldProcessing/EmailAddress/Loader.php index 8811f358c1..ed6b560b10 100644 --- a/application/Espo/Core/FieldProcessing/EmailAddress/Loader.php +++ b/application/Espo/Core/FieldProcessing/EmailAddress/Loader.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\EmailAddress; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, ORM\EntityManager, FieldProcessing\Loader as LoaderInterface, FieldProcessing\LoaderParams, diff --git a/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php b/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php index d6fca6a1dc..f64c2cb822 100644 --- a/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php +++ b/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php @@ -31,8 +31,9 @@ namespace Espo\Core\FieldProcessing\EmailAddress; use Espo\Entities\EmailAddress; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, ORM\EntityManager, ApplicationState, FieldProcessing\Saver as SaverInterface, diff --git a/application/Espo/Core/FieldProcessing/File/Saver.php b/application/Espo/Core/FieldProcessing/File/Saver.php index f70c81c9a2..494f94ab21 100644 --- a/application/Espo/Core/FieldProcessing/File/Saver.php +++ b/application/Espo/Core/FieldProcessing/File/Saver.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\File; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, ORM\EntityManager, FieldProcessing\Saver as SaverInterface, FieldProcessing\SaverParams, diff --git a/application/Espo/Core/FieldProcessing/Link/HasOneLoader.php b/application/Espo/Core/FieldProcessing/Link/HasOneLoader.php index 43053df3ff..900d99a0b8 100644 --- a/application/Espo/Core/FieldProcessing/Link/HasOneLoader.php +++ b/application/Espo/Core/FieldProcessing/Link/HasOneLoader.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\Link; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, FieldProcessing\Loader as LoaderInterface, FieldProcessing\LoaderParams, }; diff --git a/application/Espo/Core/FieldProcessing/Link/NotJoinedLoader.php b/application/Espo/Core/FieldProcessing/Link/NotJoinedLoader.php index 07886480e2..13adc69e81 100644 --- a/application/Espo/Core/FieldProcessing/Link/NotJoinedLoader.php +++ b/application/Espo/Core/FieldProcessing/Link/NotJoinedLoader.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\Link; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, ORM\EntityManager, FieldProcessing\Loader as LoaderInterface, FieldProcessing\LoaderParams, diff --git a/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php b/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php index ac9b4297d8..05ad501054 100644 --- a/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php +++ b/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\LinkMultiple; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, FieldProcessing\Loader as LoaderInterface, FieldProcessing\LoaderParams, }; diff --git a/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php b/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php index 34824bbde6..02d7eeb83c 100644 --- a/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php +++ b/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\LinkMultiple; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, FieldProcessing\Loader as LoaderInterface, FieldProcessing\LoaderParams, }; diff --git a/application/Espo/Core/FieldProcessing/LinkParent/Loader.php b/application/Espo/Core/FieldProcessing/LinkParent/Loader.php index 436a2f99e8..39af2ab8f4 100644 --- a/application/Espo/Core/FieldProcessing/LinkParent/Loader.php +++ b/application/Espo/Core/FieldProcessing/LinkParent/Loader.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\LinkParent; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, FieldProcessing\Loader as LoaderInterface, FieldProcessing\LoaderParams, }; diff --git a/application/Espo/Core/FieldProcessing/LinkParent/TargetLoader.php b/application/Espo/Core/FieldProcessing/LinkParent/TargetLoader.php index c3deb4c9d3..a4b01a600d 100644 --- a/application/Espo/Core/FieldProcessing/LinkParent/TargetLoader.php +++ b/application/Espo/Core/FieldProcessing/LinkParent/TargetLoader.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\LinkParent; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, ORM\EntityManager, FieldProcessing\Loader as LoaderInterface, FieldProcessing\LoaderParams, diff --git a/application/Espo/Core/FieldProcessing/Loader.php b/application/Espo/Core/FieldProcessing/Loader.php index c5c2257fdf..e58a3fd688 100644 --- a/application/Espo/Core/FieldProcessing/Loader.php +++ b/application/Espo/Core/FieldProcessing/Loader.php @@ -29,7 +29,7 @@ namespace Espo\Core\FieldProcessing; -use Espo\Core\ORM\Entity; +use Espo\ORM\Entity; /** * Processes loading special fields before output. diff --git a/application/Espo/Core/FieldProcessing/MultiEnum/Saver.php b/application/Espo/Core/FieldProcessing/MultiEnum/Saver.php index 5fb54d34bb..4bea317452 100644 --- a/application/Espo/Core/FieldProcessing/MultiEnum/Saver.php +++ b/application/Espo/Core/FieldProcessing/MultiEnum/Saver.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\MultiEnum; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, ORM\EntityManager, FieldProcessing\Saver as SaverInterface, FieldProcessing\SaverParams, diff --git a/application/Espo/Core/FieldProcessing/PhoneNumber/Loader.php b/application/Espo/Core/FieldProcessing/PhoneNumber/Loader.php index 16aee16d05..cca1c27c60 100644 --- a/application/Espo/Core/FieldProcessing/PhoneNumber/Loader.php +++ b/application/Espo/Core/FieldProcessing/PhoneNumber/Loader.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\PhoneNumber; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, ORM\EntityManager, FieldProcessing\Loader as LoaderInterface, FieldProcessing\LoaderParams, diff --git a/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php b/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php index 544b7e416b..cea52c401d 100644 --- a/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php +++ b/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php @@ -31,8 +31,9 @@ namespace Espo\Core\FieldProcessing\PhoneNumber; use Espo\Entities\PhoneNumber; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, ORM\EntityManager, ApplicationState, Utils\Metadata, diff --git a/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php b/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php index 668f4c4849..db357d3a49 100644 --- a/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php +++ b/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\Relation; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, ORM\EntityManager, }; diff --git a/application/Espo/Core/FieldProcessing/Relation/Saver.php b/application/Espo/Core/FieldProcessing/Relation/Saver.php index 5a903ce38e..5d77ad5f3b 100644 --- a/application/Espo/Core/FieldProcessing/Relation/Saver.php +++ b/application/Espo/Core/FieldProcessing/Relation/Saver.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\Relation; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, ORM\EntityManager, FieldProcessing\Saver as SaverInterface, FieldProcessing\SaverParams, diff --git a/application/Espo/Core/FieldProcessing/Reminder/Loader.php b/application/Espo/Core/FieldProcessing/Reminder/Loader.php index 43a197e148..75aa2e2403 100644 --- a/application/Espo/Core/FieldProcessing/Reminder/Loader.php +++ b/application/Espo/Core/FieldProcessing/Reminder/Loader.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\Reminder; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, ORM\EntityManager, FieldProcessing\Loader as LoaderInterface, FieldProcessing\LoaderParams, diff --git a/application/Espo/Core/FieldProcessing/Reminder/Saver.php b/application/Espo/Core/FieldProcessing/Reminder/Saver.php index dd93cf5323..00391cbd1c 100644 --- a/application/Espo/Core/FieldProcessing/Reminder/Saver.php +++ b/application/Espo/Core/FieldProcessing/Reminder/Saver.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\Reminder; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, ORM\EntityManager, FieldProcessing\Saver as SaverInterface, FieldProcessing\SaverParams, diff --git a/application/Espo/Core/FieldProcessing/Saver.php b/application/Espo/Core/FieldProcessing/Saver.php index 366813d93d..2304fbea85 100644 --- a/application/Espo/Core/FieldProcessing/Saver.php +++ b/application/Espo/Core/FieldProcessing/Saver.php @@ -29,7 +29,7 @@ namespace Espo\Core\FieldProcessing; -use Espo\Core\ORM\Entity; +use Espo\ORM\Entity; /** * Processes saving special fields. diff --git a/application/Espo/Core/FieldProcessing/Stream/FollowersLoader.php b/application/Espo/Core/FieldProcessing/Stream/FollowersLoader.php index 78a1d85b43..2944b37371 100644 --- a/application/Espo/Core/FieldProcessing/Stream/FollowersLoader.php +++ b/application/Espo/Core/FieldProcessing/Stream/FollowersLoader.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\Stream; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, FieldProcessing\Loader as LoaderInterface, FieldProcessing\LoaderParams, Utils\Metadata, diff --git a/application/Espo/Core/FieldProcessing/Wysiwyg/Saver.php b/application/Espo/Core/FieldProcessing/Wysiwyg/Saver.php index cb8a6cf79c..a0c5ef5493 100644 --- a/application/Espo/Core/FieldProcessing/Wysiwyg/Saver.php +++ b/application/Espo/Core/FieldProcessing/Wysiwyg/Saver.php @@ -29,8 +29,9 @@ namespace Espo\Core\FieldProcessing\Wysiwyg; +use Espo\ORM\Entity; + use Espo\Core\{ - ORM\Entity, ORM\EntityManager, FieldProcessing\Saver as SaverInterface, FieldProcessing\SaverParams, diff --git a/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php b/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php index 4224758d26..38590a47ea 100644 --- a/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php +++ b/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php @@ -29,10 +29,11 @@ namespace Espo\Modules\Crm\Classes\FieldProcessing\Call; +use Espo\ORM\Entity; + use Espo\Core\{ FieldProcessing\Loader, FieldProcessing\LoaderParams, - ORM\Entity, ORM\EntityManager, }; diff --git a/application/Espo/Modules/Crm/Classes/FieldProcessing/Campaign/StatsLoader.php b/application/Espo/Modules/Crm/Classes/FieldProcessing/Campaign/StatsLoader.php index 84efd9adb8..5f6c140d1a 100644 --- a/application/Espo/Modules/Crm/Classes/FieldProcessing/Campaign/StatsLoader.php +++ b/application/Espo/Modules/Crm/Classes/FieldProcessing/Campaign/StatsLoader.php @@ -29,10 +29,11 @@ namespace Espo\Modules\Crm\Classes\FieldProcessing\Campaign; +use Espo\ORM\Entity; + use Espo\Core\{ FieldProcessing\Loader, FieldProcessing\LoaderParams, - ORM\Entity, ORM\EntityManager, Acl, Fields\Currency\CurrencyConfigDataProvider, diff --git a/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/EntryCountLoader.php b/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/EntryCountLoader.php index 402deaf1b6..b66edb471e 100644 --- a/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/EntryCountLoader.php +++ b/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/EntryCountLoader.php @@ -29,10 +29,11 @@ namespace Espo\Modules\Crm\Classes\FieldProcessing\TargetList; +use Espo\ORM\Entity; + use Espo\Core\{ FieldProcessing\Loader, FieldProcessing\LoaderParams, - ORM\Entity, ORM\EntityManager, }; diff --git a/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/OptedOutCountLoader.php b/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/OptedOutCountLoader.php index d36fc58656..1547fe5561 100644 --- a/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/OptedOutCountLoader.php +++ b/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/OptedOutCountLoader.php @@ -29,10 +29,11 @@ namespace Espo\Modules\Crm\Classes\FieldProcessing\TargetList; +use Espo\ORM\Entity; + use Espo\Core\{ FieldProcessing\Loader, FieldProcessing\LoaderParams, - ORM\Entity, ORM\EntityManager, };