Skip to content

EspoCRM – Open Source CRM Application

move SaveContext to ORM namespace

Yurii6902ae0e0483
diff --git a/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php b/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php
index b98352c363..d1b59547d9 100644
--- a/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php
+++ b/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php
@@ -33,7 +33,7 @@ use Espo\Core\ORM\Entity as CoreEntity;
use Espo\Core\FieldProcessing\Saver\Params;
use Espo\Core\ORM\EntityManager;
-use Espo\Core\ORM\Repository\Option\SaveContext;
+use Espo\ORM\Repository\Option\SaveContext;
use Espo\Core\ORM\Repository\Option\SaveOption;
use Espo\ORM\Defs\Params\RelationParam;
use RuntimeException;
diff --git a/application/Espo/Core/Record/Service.php b/application/Espo/Core/Record/Service.php
index 2f1b3f75ef..58f98ff326 100644
--- a/application/Espo/Core/Record/Service.php
+++ b/application/Espo/Core/Record/Service.php
@@ -42,7 +42,7 @@ use Espo\Core\FieldSanitize\SanitizeManager;
use Espo\Core\ORM\Defs\AttributeParam;
use Espo\Core\ORM\Entity as CoreEntity;
use Espo\Core\ORM\Repository\Option\RemoveOption;
-use Espo\Core\ORM\Repository\Option\SaveContext;
+use Espo\ORM\Repository\Option\SaveContext;
use Espo\Core\ORM\Repository\Option\SaveOption;
use Espo\Core\ORM\Type\FieldType;
use Espo\Core\Record\Access\LinkCheck;
diff --git a/application/Espo/Hooks/Common/CallDeferredActions.php b/application/Espo/Hooks/Common/CallDeferredActions.php
index eefc5fc4a5..bf644a575b 100644
--- a/application/Espo/Hooks/Common/CallDeferredActions.php
+++ b/application/Espo/Hooks/Common/CallDeferredActions.php
@@ -30,7 +30,7 @@
namespace Espo\Hooks\Common;
use Espo\Core\Hook\Hook\AfterSave;
-use Espo\Core\ORM\Repository\Option\SaveContext;
+use Espo\ORM\Repository\Option\SaveContext;
use Espo\ORM\Entity;
use Espo\ORM\Repository\Option\SaveOptions;
diff --git a/application/Espo/Hooks/Note/Notifications.php b/application/Espo/Hooks/Note/Notifications.php
index ad2e4f2a60..a3fc8bd948 100644
--- a/application/Espo/Hooks/Note/Notifications.php
+++ b/application/Espo/Hooks/Note/Notifications.php
@@ -30,7 +30,7 @@
namespace Espo\Hooks\Note;
use Espo\Core\Hook\Hook\AfterSave;
-use Espo\Core\ORM\Repository\Option\SaveContext;
+use Espo\ORM\Repository\Option\SaveContext;
use Espo\ORM\Entity;
use Espo\ORM\Repository\Option\SaveOptions;
use Espo\Tools\Notification\HookProcessor\Params;
diff --git a/application/Espo/Modules/Crm/Hooks/Opportunity/Contacts.php b/application/Espo/Modules/Crm/Hooks/Opportunity/Contacts.php
index 0436ce1b59..d6df253645 100644
--- a/application/Espo/Modules/Crm/Hooks/Opportunity/Contacts.php
+++ b/application/Espo/Modules/Crm/Hooks/Opportunity/Contacts.php
@@ -30,7 +30,7 @@
namespace Espo\Modules\Crm\Hooks\Opportunity;
use Espo\Core\Hook\Hook\AfterSave;
-use Espo\Core\ORM\Repository\Option\SaveContext;
+use Espo\ORM\Repository\Option\SaveContext;
use Espo\Modules\Crm\Entities\Contact;
use Espo\Modules\Crm\Entities\Opportunity;
use Espo\ORM\Entity;
diff --git a/application/Espo/Core/ORM/Repository/Option/SaveContext.php b/application/Espo/ORM/Repository/Option/SaveContext.php
similarity index 97%
rename from application/Espo/Core/ORM/Repository/Option/SaveContext.php
rename to application/Espo/ORM/Repository/Option/SaveContext.php
index d1c7fb4c16..6479f34962 100644
--- a/application/Espo/Core/ORM/Repository/Option/SaveContext.php
+++ b/application/Espo/ORM/Repository/Option/SaveContext.php
@@ -27,11 +27,10 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
-namespace Espo\Core\ORM\Repository\Option;
+namespace Espo\ORM\Repository\Option;
use Closure;
use Espo\Core\Utils\Util;
-use Espo\ORM\Repository\Option\SaveOptions;
use LogicException;
/**
@@ -40,7 +39,9 @@ use LogicException;
* If a save invokes another save, the context instance should not be re-used.
* If a save invokes a relate action, the context can be passed to that action.
*
- * @since 9.1.0
+ * @since 9.4.0
+ *
+ * Before 9.4.0, since 9.1.0 it was located in the `Core` namespace.
*/
class SaveContext
{
diff --git a/application/Espo/ORM/Repository/Option/SaveOptions.php b/application/Espo/ORM/Repository/Option/SaveOptions.php
index 5651caf43d..22891e335c 100644
--- a/application/Espo/ORM/Repository/Option/SaveOptions.php
+++ b/application/Espo/ORM/Repository/Option/SaveOptions.php
@@ -29,7 +29,7 @@
namespace Espo\ORM\Repository\Option;
-use Espo\Core\ORM\Repository\Option\SaveContext;
+use Espo\ORM\Repository\Option\SaveContext;
use Espo\ORM\Repository\Option\Traits\Options;
use UnexpectedValueException;
diff --git a/application/Espo/ORM/Repository/RDBRepository.php b/application/Espo/ORM/Repository/RDBRepository.php
index bbc41d9a41..6d0b06a8b8 100644
--- a/application/Espo/ORM/Repository/RDBRepository.php
+++ b/application/Espo/ORM/Repository/RDBRepository.php
@@ -29,7 +29,7 @@
namespace Espo\ORM\Repository;
-use Espo\Core\ORM\Repository\Option\SaveContext;
+use Espo\ORM\Repository\Option\SaveContext;
use Espo\ORM\Defs\RelationDefs;
use Espo\ORM\EntityCollection;
use Espo\ORM\EntityManager;
diff --git a/application/Espo/Resources/defaults/class-aliases.php b/application/Espo/Resources/defaults/class-aliases.php
index 8b65484b1a..4bb6e7cb9b 100644
--- a/application/Espo/Resources/defaults/class-aliases.php
+++ b/application/Espo/Resources/defaults/class-aliases.php
@@ -29,6 +29,7 @@
// Aliases for backward compatibility or patches.
$map = [
+ 'Espo\\Core\\ORM\\Repository\\Option\\SaveContext' => 'Espo\\ORM\\Repository\\Option\\SaveContext',
'Espo\\Core\\Hooks\\Base' => 'Espo\\Core\\Hook\\Deprecations\\BaseHook',
'Doctrine\\DBAL\\Platforms\\Keywords\\MariaDb102Keywords' => 'Espo\\Core\\Utils\\Database\\Dbal\\Platforms\\Keywords\\MariaDb102Keywords',
];
diff --git a/application/Espo/Tools/Notification/HookProcessor.php b/application/Espo/Tools/Notification/HookProcessor.php
index ac693f90b7..3bfc318501 100644
--- a/application/Espo/Tools/Notification/HookProcessor.php
+++ b/application/Espo/Tools/Notification/HookProcessor.php
@@ -33,7 +33,7 @@ use Espo\Core\Name\Field;
use Espo\Core\Notification\AssignmentNotificatorFactory;
use Espo\Core\Notification\AssignmentNotificator;
use Espo\Core\Notification\AssignmentNotificator\Params as AssignmentNotificatorParams;
-use Espo\Core\ORM\Repository\Option\SaveContext;
+use Espo\ORM\Repository\Option\SaveContext;
use Espo\Core\Utils\Metadata;
use Espo\Core\Utils\Config;
use Espo\Tools\Stream\Service as StreamService;
diff --git a/application/Espo/Tools/Stream/HookProcessor.php b/application/Espo/Tools/Stream/HookProcessor.php
index 8686a839c7..088fcc9e31 100644
--- a/application/Espo/Tools/Stream/HookProcessor.php
+++ b/application/Espo/Tools/Stream/HookProcessor.php
@@ -32,7 +32,7 @@ namespace Espo\Tools\Stream;
use Espo\Core\Acl\AssignmentChecker\Helper;
use Espo\Core\Field\DateTime;
use Espo\Core\Name\Field;
-use Espo\Core\ORM\Repository\Option\SaveContext;
+use Espo\ORM\Repository\Option\SaveContext;
use Espo\Core\ORM\Repository\Option\SaveOption;
use Espo\Core\ORM\Entity as CoreEntity;
use Espo\Core\Utils\Metadata;
diff --git a/application/Espo/Tools/Stream/Service.php b/application/Espo/Tools/Stream/Service.php
index 70775befbd..06b358ce35 100644
--- a/application/Espo/Tools/Stream/Service.php
+++ b/application/Espo/Tools/Stream/Service.php
@@ -33,7 +33,7 @@ use Espo\Core\Field\DateTime;
use Espo\Core\Field\LinkMultiple;
use Espo\Core\Field\LinkParent;
use Espo\Core\Name\Field;
-use Espo\Core\ORM\Repository\Option\SaveContext;
+use Espo\ORM\Repository\Option\SaveContext;
use Espo\Core\ORM\Repository\Option\SaveOption;
use Espo\Core\ORM\Type\FieldType;
use Espo\Entities\StreamSubscription;