move record service container

application/Espo/Core/Action/Service.php

@@ -34,7 +34,7 @@ use Espo\Core\{
     Exceptions\ForbiddenSilent,
     Exceptions\BadRequest,
     Exceptions\NotFound,
-    RecordServiceContainer,
+    Record\ServiceContainer as RecordServiceContainer,
     Acl,
 };
 

application/Espo/Core/Binding/DefaultBinding.php

@@ -104,7 +104,7 @@ class DefaultBinding implements BindingProcessor
         );
 
         $binder->bindService(
-            'Espo\\Core\\RecordServiceContainer',
+            'Espo\\Core\\Record\\ServiceContainer',
             'recordServiceContainer'
         );
 

application/Espo/Core/Controllers/RecordBase.php

@@ -39,7 +39,7 @@ use Espo\Core\{
     ORM\EntityManager,
     Utils\ControllerUtil,
     Record\Collection as RecordCollection,
-    RecordServiceContainer,
+    Record\ServiceContainer as RecordServiceContainer,
     Api\Request,
     Api\Response,
     Record\Crud as CrudService,

application/Espo/Core/Di/RecordServiceContainerAware.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Core\Di;
 
-use Espo\Core\RecordServiceContainer;
+use Espo\Core\Record\ServiceContainer as RecordServiceContainer;
 
 interface RecordServiceContainerAware
 {

application/Espo/Core/Di/RecordServiceContainerSetter.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Core\Di;
 
-use Espo\Core\RecordServiceContainer;
+use Espo\Core\Record\ServiceContainer as RecordServiceContainer;
 
 trait RecordServiceContainerSetter
 {

application/Espo/Core/MassAction/Actions/MassDelete.php

@@ -36,7 +36,7 @@ use Espo\Core\{
     MassAction\Data,
     MassAction\MassAction,
     Acl,
-    RecordServiceContainer,
+    Record\ServiceContainer as RecordServiceContainer,
     ORM\EntityManager,
     Exceptions\Forbidden,
 };

application/Espo/Core/Record/ServiceContainer.php

@@ -27,12 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core;
+namespace Espo\Core\Record;
 
-use Espo\Core\Exceptions\Error;
-
-use Espo\Core\ServiceFactory;
-use Espo\Core\Utils\Metadata;
+use Espo\Core\{
+    Exceptions\Error,
+    ServiceFactory,
+    Utils\Metadata,
+};
 
 use Espo\Services\Record;
 
@@ -41,11 +42,11 @@ use Espo\Services\Record;
  * Usually there's no need to have multiple record service instances of the same entity type.
  * Use this container instead of serviceFactory to get record services.
  */
-class RecordServiceContainer
+class ServiceContainer
 {
     private $data = [];
 
-    protected $defaultTypeMap = [
+    private $defaultTypeMap = [
         'CategoryTree' => 'RecordTree',
     ];
 

application/Espo/Resources/metadata/app/containerServices.json

@@ -39,7 +39,7 @@
         "className": "Espo\\Core\\ServiceFactory"
     },
     "recordServiceContainer": {
-        "className": "Espo\\Core\\RecordServiceContainer"
+        "className": "Espo\\Core\\Record\\ServiceContainer"
     },
     "templateFileManager": {
         "className": "Espo\\Core\\Utils\\TemplateFileManager"

application/Espo/Tools/DataPrivacy/Erasor.php

@@ -33,7 +33,7 @@ use Espo\Core\Exceptions\Forbidden;
 use Espo\Core\Exceptions\NotFound;
 
 use Espo\Core\{
-    RecordServiceContainer,
+    Record\ServiceContainer as RecordServiceContainer,
     FieldProcessing\EmailAddress\AccessChecker as EmailAddressAccessChecker,
     FieldProcessing\PhoneNumber\AccessChecker as PhoneNumberAccessChecker,
 };

application/Espo/Tools/Import/Import.php

@@ -37,7 +37,7 @@ use Espo\Core\{
     Utils\Metadata,
     Utils\Config,
     FileStorage\Manager as FileStorageManager,
-    RecordServiceContainer,
+    Record\ServiceContainer as RecordServiceContainer,
 };
 
 use Espo\{

application/Espo/Tools/Kanban/Kanban.php

@@ -36,7 +36,7 @@ use Espo\Core\{
     Select\SearchParams,
     FieldProcessing\ListLoadProcessor,
     FieldProcessing\LoaderParams as FieldLoaderParams,
-    RecordServiceContainer,
+    Record\ServiceContainer as RecordServiceContainer,
 };
 
 use Espo\{