diff --git a/application/Espo/Classes/ConsoleCommands/PopulateNumbers.php b/application/Espo/Classes/ConsoleCommands/PopulateNumbers.php index e54a05d425..5af8f0811a 100644 --- a/application/Espo/Classes/ConsoleCommands/PopulateNumbers.php +++ b/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; diff --git a/application/Espo/Core/Authentication/Ldap/LdapLogin.php b/application/Espo/Core/Authentication/Ldap/LdapLogin.php index b7960bcd5f..35f5090a24 100644 --- a/application/Espo/Core/Authentication/Ldap/LdapLogin.php +++ b/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; diff --git a/application/Espo/Core/Authentication/Oidc/Sync.php b/application/Espo/Core/Authentication/Oidc/Sync.php index d8bef8fc3c..40c345dd2b 100644 --- a/application/Espo/Core/Authentication/Oidc/Sync.php +++ b/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; diff --git a/application/Espo/Core/ExternalAccount/ClientManager.php b/application/Espo/Core/ExternalAccount/ClientManager.php index b590b59eaf..f03f49f916 100644 --- a/application/Espo/Core/ExternalAccount/ClientManager.php +++ b/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; diff --git a/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php b/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php index 5268073b6a..774905413f 100644 --- a/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php +++ b/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; diff --git a/application/Espo/Core/FieldProcessing/NextNumber/BeforeSaveProcessor.php b/application/Espo/Core/FieldProcessing/NextNumber/BeforeSaveProcessor.php index 43041762fd..b459a75347 100644 --- a/application/Espo/Core/FieldProcessing/NextNumber/BeforeSaveProcessor.php +++ b/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; diff --git a/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php b/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php index 5edd94291d..f442d0b5e6 100644 --- a/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php +++ b/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; diff --git a/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php b/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php index b2b5e8ddf6..38e440e48c 100644 --- a/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php +++ b/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 { diff --git a/application/Espo/Core/FieldProcessing/Relation/Saver.php b/application/Espo/Core/FieldProcessing/Relation/Saver.php index f9f890d6e5..540c58715d 100644 --- a/application/Espo/Core/FieldProcessing/Relation/Saver.php +++ b/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 diff --git a/application/Espo/Core/Formula/Functions/ExtGroup/EmailGroup/SendType.php b/application/Espo/Core/Formula/Functions/ExtGroup/EmailGroup/SendType.php index 4d3c51484a..299bb2a79e 100644 --- a/application/Espo/Core/Formula/Functions/ExtGroup/EmailGroup/SendType.php +++ b/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; diff --git a/application/Espo/Core/Job/ScheduleUtil.php b/application/Espo/Core/Job/ScheduleUtil.php index 611b569390..67685501c0 100644 --- a/application/Espo/Core/Job/ScheduleUtil.php +++ b/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; diff --git a/application/Espo/Core/Mail/Account/GroupAccount/Account.php b/application/Espo/Core/Mail/Account/GroupAccount/Account.php index 3127d6793b..c29a73b23d 100644 --- a/application/Espo/Core/Mail/Account/GroupAccount/Account.php +++ b/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; diff --git a/application/Espo/Core/Mail/Account/PersonalAccount/Account.php b/application/Espo/Core/Mail/Account/PersonalAccount/Account.php index 1de6d46e67..5bf9059f05 100644 --- a/application/Espo/Core/Mail/Account/PersonalAccount/Account.php +++ b/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; diff --git a/application/Espo/Core/Mail/Importer.php b/application/Espo/Core/Mail/Importer.php index 9bb0c849ef..c677054015 100644 --- a/application/Espo/Core/Mail/Importer.php +++ b/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; diff --git a/application/Espo/Core/Mail/Sender.php b/application/Espo/Core/Mail/Sender.php index 3ab9089dee..ca0c239393 100644 --- a/application/Espo/Core/Mail/Sender.php +++ b/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; diff --git a/application/Espo/Core/ORM/Repository/HookMediator.php b/application/Espo/Core/ORM/Repository/HookMediator.php index f7bba2d47c..783fc07766 100644 --- a/application/Espo/Core/ORM/Repository/HookMediator.php +++ b/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; } diff --git a/application/Espo/Core/ORM/Repository/SaveOption.php b/application/Espo/Core/ORM/Repository/Option/SaveOption.php similarity index 95% rename from application/Espo/Core/ORM/Repository/SaveOption.php rename to application/Espo/Core/ORM/Repository/Option/SaveOption.php index 9041897118..c73bd1cebc 100644 --- a/application/Espo/Core/ORM/Repository/SaveOption.php +++ b/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. diff --git a/application/Espo/Core/Repositories/Database.php b/application/Espo/Core/Repositories/Database.php index 2cf368f3a7..b462ffac20 100644 --- a/application/Espo/Core/Repositories/Database.php +++ b/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; diff --git a/application/Espo/Hooks/Common/AssignmentEmailNotification.php b/application/Espo/Hooks/Common/AssignmentEmailNotification.php index 108d45b825..84450a77a6 100644 --- a/application/Espo/Hooks/Common/AssignmentEmailNotification.php +++ b/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; diff --git a/application/Espo/Hooks/Common/Notifications.php b/application/Espo/Hooks/Common/Notifications.php index 2933fbdbab..8d17d68696 100644 --- a/application/Espo/Hooks/Common/Notifications.php +++ b/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; diff --git a/application/Espo/Hooks/Common/Stream.php b/application/Espo/Hooks/Common/Stream.php index abb22c8b07..d9a9248362 100644 --- a/application/Espo/Hooks/Common/Stream.php +++ b/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; diff --git a/application/Espo/Hooks/Common/StreamNotesAcl.php b/application/Espo/Hooks/Common/StreamNotesAcl.php index 2611b8d36b..1dfe724435 100644 --- a/application/Espo/Hooks/Common/StreamNotesAcl.php +++ b/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; diff --git a/application/Espo/Hooks/Common/WebSocketSubmit.php b/application/Espo/Hooks/Common/WebSocketSubmit.php index 4cc5282128..a3f37f22e4 100644 --- a/application/Espo/Hooks/Common/WebSocketSubmit.php +++ b/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}; diff --git a/application/Espo/Hooks/Common/Webhook.php b/application/Espo/Hooks/Common/Webhook.php index 4d2215a52a..4d59c333d2 100644 --- a/application/Espo/Hooks/Common/Webhook.php +++ b/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}; diff --git a/application/Espo/Hooks/Note/Mentions.php b/application/Espo/Hooks/Note/Mentions.php index 26fd23b3fa..25c927b5f7 100644 --- a/application/Espo/Hooks/Note/Mentions.php +++ b/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; diff --git a/application/Espo/Modules/Crm/EntryPoints/EventConfirmation.php b/application/Espo/Modules/Crm/EntryPoints/EventConfirmation.php index 7c72731553..b24bb2416b 100644 --- a/application/Espo/Modules/Crm/EntryPoints/EventConfirmation.php +++ b/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; diff --git a/application/Espo/Modules/Crm/Hooks/Meeting/EmailCreatedEvent.php b/application/Espo/Modules/Crm/Hooks/Meeting/EmailCreatedEvent.php index 44d0e00764..243c85fdda 100644 --- a/application/Espo/Modules/Crm/Hooks/Meeting/EmailCreatedEvent.php +++ b/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; diff --git a/application/Espo/Modules/Crm/Hooks/Task/DateCompleted.php b/application/Espo/Modules/Crm/Hooks/Task/DateCompleted.php index 64c9936929..af813cf5a9 100644 --- a/application/Espo/Modules/Crm/Hooks/Task/DateCompleted.php +++ b/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; diff --git a/application/Espo/ORM/Repository/SaveOption.php b/application/Espo/ORM/Repository/Option/SaveOption.php similarity index 97% rename from application/Espo/ORM/Repository/SaveOption.php rename to application/Espo/ORM/Repository/Option/SaveOption.php index 50025095d1..655a74d314 100644 --- a/application/Espo/ORM/Repository/SaveOption.php +++ b/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 { diff --git a/application/Espo/ORM/Repository/RDBRepository.php b/application/Espo/ORM/Repository/RDBRepository.php index e2330a5e9c..aac841faf0 100644 --- a/application/Espo/ORM/Repository/RDBRepository.php +++ b/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; diff --git a/application/Espo/Repositories/Email.php b/application/Espo/Repositories/Email.php index 24994d89d7..b6a9868951 100644 --- a/application/Espo/Repositories/Email.php +++ b/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; diff --git a/application/Espo/Repositories/UserData.php b/application/Espo/Repositories/UserData.php index e141bb25e5..31fa0a8757 100644 --- a/application/Espo/Repositories/UserData.php +++ b/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; diff --git a/application/Espo/Tools/Email/SendService.php b/application/Espo/Tools/Email/SendService.php index 023bb28b7c..d81313225b 100644 --- a/application/Espo/Tools/Email/SendService.php +++ b/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; diff --git a/application/Espo/Tools/Import/Import.php b/application/Espo/Tools/Import/Import.php index 546c74bece..c392dd20a2 100644 --- a/application/Espo/Tools/Import/Import.php +++ b/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; diff --git a/application/Espo/Tools/Import/Service.php b/application/Espo/Tools/Import/Service.php index bd1ef10442..2a0f3656b3 100644 --- a/application/Espo/Tools/Import/Service.php +++ b/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; diff --git a/application/Espo/Tools/Stream/HookProcessor.php b/application/Espo/Tools/Stream/HookProcessor.php index 26b4fdf255..9e27e4df22 100644 --- a/application/Espo/Tools/Stream/HookProcessor.php +++ b/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; diff --git a/application/Espo/Tools/UserSecurity/Password/Service.php b/application/Espo/Tools/UserSecurity/Password/Service.php index 0b6dc7680a..619cfd9a74 100644 --- a/application/Espo/Tools/UserSecurity/Password/Service.php +++ b/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; diff --git a/tests/unit/Espo/Core/FieldProcessing/SaverParamsTest.php b/tests/unit/Espo/Core/FieldProcessing/SaverParamsTest.php index 5cf8bd045b..81a8ddab02 100644 --- a/tests/unit/Espo/Core/FieldProcessing/SaverParamsTest.php +++ b/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 { diff --git a/tests/unit/Espo/Core/Notification/AssignmentNotificatorParamsTest.php b/tests/unit/Espo/Core/Notification/AssignmentNotificatorParamsTest.php index 2bc67408ca..1b0da9e29b 100644 --- a/tests/unit/Espo/Core/Notification/AssignmentNotificatorParamsTest.php +++ b/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 { diff --git a/upgrades/7.0/scripts/AfterUpgrade.php b/upgrades/7.0/scripts/AfterUpgrade.php index 7fbe57e8f1..3b0247d8fa 100644 --- a/upgrades/7.0/scripts/AfterUpgrade.php +++ b/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]); } }