ref move

application/Espo/Classes/ConsoleCommands/PopulateNumbers.php

@@ -37,7 +37,7 @@ use Espo\Core\Console\IO;
 use Espo\Core\Exceptions\Error;
 use Espo\Core\FieldProcessing\NextNumber\BeforeSaveProcessor;
 use Espo\Core\ORM\Entity as CoreEntity;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\ORM\EntityManager;
 use Espo\ORM\Query\Part\Order;
 

application/Espo/Core/Authentication/Ldap/LdapLogin.php

@@ -44,7 +44,7 @@ use Espo\Core\Authentication\Logins\Espo;
 use Espo\Core\Authentication\Result;
 use Espo\Core\Authentication\Result\FailReason;
 use Espo\Core\ORM\EntityManager;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Core\Utils\Config;
 use Espo\Core\Utils\Language;
 use Espo\Core\Utils\Log;

application/Espo/Core/Authentication/Oidc/Sync.php

@@ -35,7 +35,7 @@ use Espo\Core\FieldProcessing\EmailAddress\Saver as EmailAddressSaver;
 use Espo\Core\FieldProcessing\PhoneNumber\Saver as PhoneNumberSaver;
 use Espo\Core\FieldProcessing\Relation\LinkMultipleSaver;
 use Espo\Core\FieldProcessing\Saver\Params as SaverParams;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Core\Utils\Config;
 use Espo\Core\Utils\PasswordHash;
 use Espo\Core\Utils\Util;

application/Espo/Core/ExternalAccount/ClientManager.php

@@ -39,7 +39,7 @@ use Espo\ORM\EntityManager;
 use Espo\Core\ExternalAccount\Clients\IClient;
 use Espo\Core\ExternalAccount\OAuth2\Client as OAuth2Client;
 use Espo\Core\InjectableFactory;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Core\Utils\Config;
 use Espo\Core\Utils\Metadata;
 

application/Espo/Core/FieldProcessing/EmailAddress/Saver.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Core\FieldProcessing\EmailAddress;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Entities\EmailAddress;
 use Espo\Repositories\EmailAddress as EmailAddressRepository;
 use Espo\ORM\Entity;

application/Espo/Core/FieldProcessing/NextNumber/BeforeSaveProcessor.php

@@ -30,7 +30,7 @@
 namespace Espo\Core\FieldProcessing\NextNumber;
 
 use Espo\Core\Exceptions\Error;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Entities\NextNumber;
 
 use Espo\Core\ORM\Entity;

application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Core\FieldProcessing\PhoneNumber;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Entities\PhoneNumber;
 use Espo\Repositories\PhoneNumber as PhoneNumberRepository;
 

application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php

@@ -34,7 +34,7 @@ use Espo\ORM\Entity;
 use Espo\Core\{
     ORM\EntityManager,
     FieldProcessing\Saver\Params,
-    ORM\Repository\SaveOption};
+    ORM\Repository\Option\SaveOption};
 
 class LinkMultipleSaver
 {

application/Espo/Core/FieldProcessing/Relation/Saver.php

@@ -34,7 +34,7 @@ use Espo\ORM\Entity;
 use Espo\Core\FieldProcessing\Saver as SaverInterface;
 use Espo\Core\FieldProcessing\Saver\Params;
 use Espo\Core\ORM\EntityManager;
-use Espo\ORM\Repository\SaveOption;
+use Espo\ORM\Repository\Option\SaveOption;
 
 /**
  * @implements SaverInterface<Entity>

application/Espo/Core/Formula/Functions/ExtGroup/EmailGroup/SendType.php

@@ -30,7 +30,7 @@
 namespace Espo\Core\Formula\Functions\ExtGroup\EmailGroup;
 
 use Espo\Core\ApplicationUser;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Entities\Email;
 use Espo\Tools\Email\SendService;
 use Exception;

application/Espo/Core/Job/ScheduleUtil.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Core\Job;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\ORM\Collection;
 use Espo\ORM\EntityManager;
 

application/Espo/Core/Mail/Account/GroupAccount/Account.php

@@ -36,7 +36,7 @@ use Espo\Core\Mail\Exceptions\NoSmtp;
 use Espo\Core\Mail\Account\ImapParams;
 use Espo\Core\Mail\Smtp\HandlerProcessor;
 use Espo\Core\Mail\SmtpParams;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Core\Utils\Config;
 
 use Espo\Core\Utils\Crypt;

application/Espo/Core/Mail/Account/PersonalAccount/Account.php

@@ -39,7 +39,7 @@ use Espo\Core\Mail\Exceptions\NoSmtp;
 use Espo\Core\Mail\Account\ImapParams;
 use Espo\Core\Mail\Smtp\HandlerProcessor;
 use Espo\Core\Mail\SmtpParams;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Core\Utils\Config;
 
 use Espo\Core\Utils\Crypt;

application/Espo/Core/Mail/Importer.php

@@ -33,7 +33,7 @@ use Espo\Core\Job\Job\Data as JobData;
 use Espo\Core\Job\JobSchedulerFactory;
 use Espo\Core\Mail\Importer\DuplicateFinder;
 use Espo\Core\Mail\Importer\ParentFinder;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Entities\Email;
 use Espo\Entities\EmailFilter;
 use Espo\Repositories\Email as EmailRepository;

application/Espo/Core/Mail/Sender.php

@@ -32,7 +32,7 @@ namespace Espo\Core\Mail;
 use Espo\Core\FileStorage\Manager as FileStorageManager;
 use Espo\Core\Mail\Exceptions\NoSmtp;
 use Espo\Core\Mail\Smtp\TransportFactory;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\ORM\Collection;
 use Espo\ORM\EntityCollection;
 

application/Espo/Core/ORM/Repository/HookMediator.php

@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 use Espo\ORM\Query\Select;
 use Espo\ORM\Repository\EmptyHookMediator;
 use Espo\Core\HookManager;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 
 class HookMediator extends EmptyHookMediator
 {
@@ -81,7 +81,7 @@ class HookMediator extends EmptyHookMediator
      */
     public function afterUnrelate(Entity $entity, string $relationName, Entity $foreignEntity, array $options): void
     {
-        if (!empty($options[SaveOption::SKIP_HOOKS])) {
+        if (!empty($options[Option\SaveOption::SKIP_HOOKS])) {
             return;
         }
 

application/Espo/Core/ORM/Repository/Option/SaveOption.php

@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\ORM\Repository;
+namespace Espo\Core\ORM\Repository\Option;
 
-use Espo\ORM\Repository\SaveOption as BaseSaveOption;
+use Espo\ORM\Repository\Option\SaveOption as BaseSaveOption;
 
 /**
  * Save options.

application/Espo/Core/Repositories/Database.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Core\Repositories;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\ORM\BaseEntity;
 use Espo\ORM\Entity;
 use Espo\ORM\Repository\RDBRepository;

application/Espo/Hooks/Common/AssignmentEmailNotification.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Hooks\Common;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\ORM\Entity;
 use Espo\Tools\EmailNotification\HookProcessor;
 

application/Espo/Hooks/Common/Notifications.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Hooks\Common;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Tools\Notification\HookProcessor;
 use Espo\ORM\Entity;
 

application/Espo/Hooks/Common/Stream.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Hooks\Common;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\ORM\Entity;
 use Espo\Tools\Stream\HookProcessor;
 

application/Espo/Hooks/Common/StreamNotesAcl.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Hooks\Common;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\ORM\Entity;
 
 use Espo\Tools\Stream\Service as Service;

application/Espo/Hooks/Common/WebSocketSubmit.php

@@ -32,7 +32,7 @@ namespace Espo\Hooks\Common;
 use Espo\ORM\Entity;
 
 use Espo\Core\{
-    ORM\Repository\SaveOption,
+    ORM\Repository\Option\SaveOption,
     Utils\Metadata,
     Utils\Config,
     WebSocket\Submission as WebSocketSubmission};

application/Espo/Hooks/Common/Webhook.php

@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 use Espo\Core\ORM\Entity as CoreEntity;
 
 use Espo\Core\{
-    ORM\Repository\SaveOption,
+    ORM\Repository\Option\SaveOption,
     Utils\Metadata,
     Webhook\Manager as WebhookManager};
 

application/Espo/Hooks/Note/Mentions.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Hooks\Note;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Tools\Notification\NoteMentionHookProcessor;
 use Espo\ORM\Entity;
 use Espo\Entities\Note;

application/Espo/Modules/Crm/EntryPoints/EventConfirmation.php

@@ -38,7 +38,7 @@ use Espo\Core\Exceptions\Error;
 use Espo\Core\Exceptions\NotFound;
 use Espo\Core\HookManager;
 use Espo\Core\ORM\EntityManager;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Core\Utils\Client\ActionRenderer;
 use Espo\Core\Utils\Language;
 use Espo\Core\Utils\Metadata;

application/Espo/Modules/Crm/Hooks/Meeting/EmailCreatedEvent.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\Hooks\Meeting;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Entities\Email;
 use Espo\ORM\EntityManager;
 use Espo\ORM\Entity;

application/Espo/Modules/Crm/Hooks/Task/DateCompleted.php

@@ -30,7 +30,7 @@
 namespace Espo\Modules\Crm\Hooks\Task;
 
 use Espo\Core\Field\DateTime;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Modules\Crm\Entities\Task;
 use Espo\ORM\Entity;
 

application/Espo/ORM/Repository/Option/SaveOption.php

@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\Repository;
+namespace Espo\ORM\Repository\Option;
 
 class SaveOption
 {

application/Espo/ORM/Repository/RDBRepository.php

@@ -32,6 +32,7 @@ namespace Espo\ORM\Repository;
 use Espo\ORM\EntityManager;
 use Espo\ORM\EntityFactory;
 use Espo\ORM\Collection;
+use Espo\ORM\Repository\Option\SaveOption;
 use Espo\ORM\SthCollection;
 use Espo\ORM\BaseEntity;
 use Espo\ORM\Entity;

application/Espo/Repositories/Email.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Repositories;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Entities\EmailFilter;
 use Espo\Entities\InboundEmail;
 use Espo\Entities\User as UserEntity;

application/Espo/Repositories/UserData.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Repositories;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Entities\User as UserEntity;
 use Espo\Entities\UserData as UserDataEntity;
 use Espo\Core\Repositories\Database;

application/Espo/Tools/Email/SendService.php

@@ -51,7 +51,7 @@ use Espo\Core\Mail\Exceptions\SendingError;
 use Espo\Core\Mail\SenderParams;
 use Espo\Core\Mail\Smtp\HandlerProcessor;
 use Espo\Core\Mail\SmtpParams;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Core\Utils\Config;
 use Espo\Core\Utils\Json;
 use Espo\Core\Utils\Log;

application/Espo/Tools/Import/Import.php

@@ -42,7 +42,7 @@ use Espo\Core\Exceptions\Forbidden;
 use Espo\Core\FieldValidation\Failure;
 use Espo\Core\FieldValidation\FieldValidationManager;
 use Espo\Core\FileStorage\Manager as FileStorageManager;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Core\Record\ServiceContainer as RecordServiceContainer;
 use Espo\Core\Utils\Config;
 use Espo\Core\Utils\DateTime as DateTimeUtil;

application/Espo/Tools/Import/Service.php

@@ -31,7 +31,7 @@ namespace Espo\Tools\Import;
 
 use GuzzleHttp\Psr7\Utils as Psr7Utils;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Entities\ImportEntity as ImportEntityEntity;
 use Espo\Core\Exceptions\Error;
 use Espo\Core\Exceptions\NotFound;

application/Espo/Tools/Stream/HookProcessor.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Tools\Stream;
 
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Core\Utils\Metadata;
 use Espo\Entities\Autofollow;
 use Espo\Tools\Stream\Service as Service;

application/Espo/Tools/UserSecurity/Password/Service.php

@@ -36,7 +36,7 @@ use Espo\Core\Exceptions\NotFound;
 use Espo\Core\FieldValidation\FieldValidationManager;
 use Espo\Core\Mail\EmailSender;
 use Espo\Core\Mail\Exceptions\SendingError;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 use Espo\Core\Record\ServiceContainer;
 use Espo\Core\Utils\Config;
 use Espo\Core\Utils\PasswordHash;

tests/unit/Espo/Core/FieldProcessing/SaverParamsTest.php

@@ -31,7 +31,7 @@ namespace tests\unit\Espo\Core\FieldProcessing;
 
 use Espo\Core\{
     FieldProcessing\Saver\Params,
-    ORM\Repository\SaveOption};
+    ORM\Repository\Option\SaveOption};
 
 class SaverParamsTest extends \PHPUnit\Framework\TestCase
 {

tests/unit/Espo/Core/Notification/AssignmentNotificatorParamsTest.php

@@ -30,7 +30,7 @@
 namespace tests\unit\Espo\Core\Notification;
 
 use Espo\Core\Notification\AssignmentNotificator\Params;
-use Espo\Core\ORM\Repository\SaveOption;
+use Espo\Core\ORM\Repository\Option\SaveOption;
 
 class AssignmentNotificatorParamsTest extends \PHPUnit\Framework\TestCase
 {

upgrades/7.0/scripts/AfterUpgrade.php

@@ -28,7 +28,6 @@
  ************************************************************************/
 
 use Espo\Core\Container;
-use Espo\Core\ORM\Repository\SaveOption;
 use Espo\Core\Utils\Metadata;
 use Espo\Core\Utils\File\Manager as FileManager;
 use Espo\Core\Utils\Json;
@@ -84,7 +83,7 @@ class AfterUpgrade
             $template->set('body', $body);
             $template->set('header', null);
 
-            $entityManager->saveEntity($template, [SaveOption::SKIP_HOOKS => true]);
+            $entityManager->saveEntity($template, ['skipHooks' => true]);
         }
     }