field processing fix

2026-06-28 06:56:05 +00:00 · 2021-04-29 11:47:34 +03:00
parent 93e4bd8cd0
commit fb94597409
31 changed files with 60 additions and 31 deletions
--- 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,
 };

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

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

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

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

--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
 };
--- 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,
--- 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,
 };
--- 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,
 };
--- 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,
 };
--- 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,
--- 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.
--- 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,
--- 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,
--- 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,
--- 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,
 };

--- 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,
--- 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,
--- 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,
--- 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.
--- 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,
--- 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,
--- 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,
 };

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

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