feat: Moved Log entity to a different namespace to handle with a di…

…fferent entity-manager and avoid flushing Log in the same transaction with other entities

BREAKING CHANGE: Log namespace changed to `RZ\Roadiz\CoreBundle\Logger\Entity\Log`

Make sure you update `config/packages/doctrine.yaml` with:

```yaml
    orm:
        auto_generate_proxy_classes: true
        default_entity_manager: default
        entity_managers:
            # Put `logger` entity manager first to select it as default for Log entity
            logger:
                naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
                mappings:
                    ## Just sharding EM to avoid having Logs in default EM
                    ## and flushing bad entities when storing log entries.
                    RoadizCoreLogger:
                        is_bundle: false
                        type: attribute
                        dir: '%kernel.project_dir%/vendor/roadiz/core-bundle/src/Logger/Entity'
                        prefix: 'RZ\Roadiz\CoreBundle\Logger\Entity'
                        alias: RoadizCoreLogger
            default:
                dql:
                    string_functions:
                        JSON_CONTAINS: Scienta\DoctrineJsonFunctions\Query\AST\Functions\Mysql\JsonContains
                naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
                auto_mapping: true
                mappings:
                    ## Keep RoadizCoreLogger to avoid creating different migrations since we are using
                    ## the same database for both entity managers. Just sharding EM to avoid
                    ## having Logs in default EM and flushing bad entities when storing log entries.
                    RoadizCoreLogger:
                        is_bundle: false
                        type: attribute
                        dir: '%kernel.project_dir%/vendor/roadiz/core-bundle/src/Logger/Entity'
                        prefix: 'RZ\Roadiz\CoreBundle\Logger\Entity'
                        alias: RoadizCoreLogger
                    App:
                        is_bundle: false
                        type: attribute
                        dir: '%kernel.project_dir%/src/Entity'
                        prefix: 'App\Entity'
                        alias: App
	            # ...
```

config/packages/doctrine.yaml

@@ -6,55 +6,77 @@ doctrine:
         # either here or in the DATABASE_URL env var (see .env file)
         #server_version: '13'
     orm:
-        dql:
-            string_functions:
-                JSON_CONTAINS: Scienta\DoctrineJsonFunctions\Query\AST\Functions\Mysql\JsonContains
         auto_generate_proxy_classes: true
-        naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
-        auto_mapping: true
-        mappings:
-            RoadizCoreBundle:
-                is_bundle: true
-                type: attribute
-                dir: 'src/Entity'
-                prefix: 'RZ\Roadiz\CoreBundle\Entity'
-                alias: RoadizCoreBundle
-            RoadizFontBundle:
-                is_bundle: true
-                type: attribute
-                dir: 'src/Entity'
-                prefix: 'RZ\Roadiz\FontBundle\Entity'
-                alias: RoadizFontBundle
-            RoadizUserBundle:
-                is_bundle: true
-                type: attribute
-                dir: 'src/Entity'
-                prefix: 'RZ\Roadiz\UserBundle\Entity'
-                alias: RoadizUserBundle
-            RZ\Roadiz\Core:
-                is_bundle: false
-                type: attribute
-                dir: '%kernel.project_dir%/lib/Models/src/Core/AbstractEntities'
-                prefix: 'RZ\Roadiz\Core\AbstractEntities'
-                alias: AbstractEntities
-            App\GeneratedEntity:
-                is_bundle: false
-                type: attribute
-                dir: '%kernel.project_dir%/src/GeneratedEntity'
-                prefix: 'App\GeneratedEntity'
-                alias: App\GeneratedEntity
-            App:
-                is_bundle: false
-                type: attribute
-                dir: '%kernel.project_dir%/src/Entity'
-                prefix: 'App\Entity'
-                alias: App
-            gedmo_loggable:
-                type: attribute
-                prefix: Gedmo\Loggable\Entity\MappedSuperclass
-                dir: "%kernel.project_dir%/vendor/gedmo/doctrine-extensions/src/Loggable/Entity/MappedSuperclass"
-                alias: GedmoLoggableMappedSuperclass
-                is_bundle: false
+        default_entity_manager: default
+        entity_managers:
+            # Put `logger` entity manager first to select it as default for Log entity
+            logger:
+                naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
+                mappings:
+                    RoadizCoreLogger:
+                        is_bundle: false
+                        type: attribute
+                        dir: '%kernel.project_dir%/lib/RoadizCoreBundle/src/Logger/Entity'
+                        prefix: 'RZ\Roadiz\CoreBundle\Logger\Entity'
+                        alias: RoadizCoreLogger
+            default:
+                dql:
+                    string_functions:
+                        JSON_CONTAINS: Scienta\DoctrineJsonFunctions\Query\AST\Functions\Mysql\JsonContains
+                naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
+                auto_mapping: true
+                mappings:
+                    ## Keep RoadizCoreLogger to avoid migrations overlap since we are using
+                    ## the same database for both entity managers. Just sharding EM to avoid
+                    ## having Logs in default EM and flushing bad entities when storing log entries.
+                    RoadizCoreLogger:
+                        is_bundle: false
+                        type: attribute
+                        dir: '%kernel.project_dir%/lib/RoadizCoreBundle/src/Logger/Entity'
+                        prefix: 'RZ\Roadiz\CoreBundle\Logger\Entity'
+                        alias: RoadizCoreLogger
+                    RoadizCoreBundle:
+                        is_bundle: true
+                        type: attribute
+                        dir: 'src/Entity'
+                        prefix: 'RZ\Roadiz\CoreBundle\Entity'
+                        alias: RoadizCoreBundle
+                    RoadizFontBundle:
+                        is_bundle: true
+                        type: attribute
+                        dir: 'src/Entity'
+                        prefix: 'RZ\Roadiz\FontBundle\Entity'
+                        alias: RoadizFontBundle
+                    RoadizUserBundle:
+                        is_bundle: true
+                        type: attribute
+                        dir: 'src/Entity'
+                        prefix: 'RZ\Roadiz\UserBundle\Entity'
+                        alias: RoadizUserBundle
+                    RZ\Roadiz\Core:
+                        is_bundle: false
+                        type: attribute
+                        dir: '%kernel.project_dir%/lib/Models/src/Core/AbstractEntities'
+                        prefix: 'RZ\Roadiz\Core\AbstractEntities'
+                        alias: AbstractEntities
+                    App\GeneratedEntity:
+                        is_bundle: false
+                        type: attribute
+                        dir: '%kernel.project_dir%/src/GeneratedEntity'
+                        prefix: 'App\GeneratedEntity'
+                        alias: App\GeneratedEntity
+                    App:
+                        is_bundle: false
+                        type: attribute
+                        dir: '%kernel.project_dir%/src/Entity'
+                        prefix: 'App\Entity'
+                        alias: App
+                    gedmo_loggable:
+                        type: attribute
+                        prefix: Gedmo\Loggable\Entity\MappedSuperclass
+                        dir: "%kernel.project_dir%/vendor/gedmo/doctrine-extensions/src/Loggable/Entity/MappedSuperclass"
+                        alias: GedmoLoggableMappedSuperclass
+                        is_bundle: false
 
         resolve_target_entities:
             Symfony\Component\Security\Core\User\UserInterface: RZ\Roadiz\CoreBundle\Entity\User

lib/RoadizCompatBundle/src/Aliases.php

@@ -65,7 +65,7 @@ public static function getAliases(): array
             \RZ\Roadiz\CoreBundle\Entity\Folder::class => \RZ\Roadiz\Core\Entities\Folder::class,
             \RZ\Roadiz\CoreBundle\Entity\FolderTranslation::class => \RZ\Roadiz\Core\Entities\FolderTranslation::class,
             \RZ\Roadiz\CoreBundle\Entity\Group::class => \RZ\Roadiz\Core\Entities\Group::class,
-            \RZ\Roadiz\CoreBundle\Entity\Log::class => \RZ\Roadiz\Core\Entities\Log::class,
+            \RZ\Roadiz\CoreBundle\Logger\Entity\Log::class => \RZ\Roadiz\Core\Entities\Log::class,
             \RZ\Roadiz\CoreBundle\Entity\Node::class => \RZ\Roadiz\Core\Entities\Node::class,
             \RZ\Roadiz\CoreBundle\Entity\NodeType::class => \RZ\Roadiz\Core\Entities\NodeType::class,
             \RZ\Roadiz\CoreBundle\Entity\NodeTypeField::class => \RZ\Roadiz\Core\Entities\NodeTypeField::class,

lib/RoadizCoreBundle/config/packages/doctrine.yaml

@@ -5,43 +5,67 @@ doctrine:
         # either here or in the DATABASE_URL env var (see .env file)
         #server_version: '13'
     orm:
-        dql:
-            string_functions:
-                JSON_CONTAINS: Scienta\DoctrineJsonFunctions\Query\AST\Functions\Mysql\JsonContains
         auto_generate_proxy_classes: true
-        naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
-        auto_mapping: true
-        mappings:
-            App:
-                is_bundle: false
-                type: attribute
-                dir: '%kernel.project_dir%/src/Entity'
-                prefix: 'App\Entity'
-                alias: App
-            RoadizCoreBundle:
-                is_bundle: true
-                type: attribute
-                dir: 'src/Entity'
-                prefix: 'RZ\Roadiz\CoreBundle\Entity'
-                alias: RoadizCoreBundle
-            RZ\Roadiz\Core:
-                is_bundle: false
-                type: annotation
-                dir: '%kernel.project_dir%/vendor/roadiz/models/src/Core/AbstractEntities'
-                prefix: 'RZ\Roadiz\Core\AbstractEntities'
-                alias: AbstractEntities
-            App\GeneratedEntity:
-                is_bundle: false
-                type: attribute
-                dir: '%kernel.project_dir%/src/GeneratedEntity'
-                prefix: 'App\GeneratedEntity'
-                alias: App\GeneratedEntity
-            gedmo_loggable:
-                type: attribute
-                prefix: Gedmo\Loggable\Entity\MappedSuperclass
-                dir: "%kernel.project_dir%/vendor/gedmo/doctrine-extensions/src/Loggable/Entity/MappedSuperclass"
-                alias: GedmoLoggableMappedSuperclass
-                is_bundle: false
+        default_entity_manager: default
+        entity_managers:
+            # Put `logger` entity manager first to select it as default for Log entity
+            logger:
+                naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
+                mappings:
+                    ## Just sharding EM to avoid having Logs in default EM
+                    ## and flushing bad entities when storing log entries.
+                    RoadizCoreLogger:
+                        is_bundle: false
+                        type: attribute
+                        dir: '%kernel.project_dir%/vendor/roadiz/core-bundle/src/Logger/Entity'
+                        prefix: 'RZ\Roadiz\CoreBundle\Logger\Entity'
+                        alias: RoadizCoreLogger
+            default:
+                dql:
+                    string_functions:
+                        JSON_CONTAINS: Scienta\DoctrineJsonFunctions\Query\AST\Functions\Mysql\JsonContains
+                naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
+                auto_mapping: true
+                mappings:
+                    ## Keep RoadizCoreLogger to avoid creating different migrations since we are using
+                    ## the same database for both entity managers. Just sharding EM to avoid
+                    ## having Logs in default EM and flushing bad entities when storing log entries.
+                    RoadizCoreLogger:
+                        is_bundle: false
+                        type: attribute
+                        dir: '%kernel.project_dir%/vendor/roadiz/core-bundle/src/Logger/Entity'
+                        prefix: 'RZ\Roadiz\CoreBundle\Logger\Entity'
+                        alias: RoadizCoreLogger
+                    App:
+                        is_bundle: false
+                        type: attribute
+                        dir: '%kernel.project_dir%/src/Entity'
+                        prefix: 'App\Entity'
+                        alias: App
+                    RoadizCoreBundle:
+                        is_bundle: true
+                        type: attribute
+                        dir: 'src/Entity'
+                        prefix: 'RZ\Roadiz\CoreBundle\Entity'
+                        alias: RoadizCoreBundle
+                    RZ\Roadiz\Core:
+                        is_bundle: false
+                        type: annotation
+                        dir: '%kernel.project_dir%/vendor/roadiz/models/src/Core/AbstractEntities'
+                        prefix: 'RZ\Roadiz\Core\AbstractEntities'
+                        alias: AbstractEntities
+                    App\GeneratedEntity:
+                        is_bundle: false
+                        type: attribute
+                        dir: '%kernel.project_dir%/src/GeneratedEntity'
+                        prefix: 'App\GeneratedEntity'
+                        alias: App\GeneratedEntity
+                    gedmo_loggable:
+                        type: attribute
+                        prefix: Gedmo\Loggable\Entity\MappedSuperclass
+                        dir: "%kernel.project_dir%/vendor/gedmo/doctrine-extensions/src/Loggable/Entity/MappedSuperclass"
+                        alias: GedmoLoggableMappedSuperclass
+                        is_bundle: false
 
         resolve_target_entities:
             Symfony\Component\Security\Core\User\UserInterface: RZ\Roadiz\CoreBundle\Entity\User

lib/RoadizCoreBundle/src/Console/LogsCleanupCommand.php

@@ -6,7 +6,7 @@
 
 use Doctrine\ORM\NoResultException;
 use Doctrine\Persistence\ManagerRegistry;
-use RZ\Roadiz\CoreBundle\Entity\Log;
+use RZ\Roadiz\CoreBundle\Logger\Entity\Log;
 use RZ\Roadiz\CoreBundle\Repository\LogRepository;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Exception\InvalidArgumentException;

lib/RoadizCoreBundle/src/Logger/DoctrineHandler.php

@@ -8,10 +8,10 @@
 use Monolog\Handler\AbstractProcessingHandler;
 use Monolog\Logger;
 use RZ\Roadiz\Core\AbstractEntities\PersistableInterface;
-use RZ\Roadiz\CoreBundle\Entity\Log;
 use RZ\Roadiz\CoreBundle\Entity\Node;
 use RZ\Roadiz\CoreBundle\Entity\NodesSources;
 use RZ\Roadiz\CoreBundle\Entity\User;
+use RZ\Roadiz\CoreBundle\Logger\Entity\Log;
 use RZ\Roadiz\Documents\Models\DocumentInterface;
 use RZ\Roadiz\Documents\UrlGenerators\DocumentUrlGeneratorInterface;
 use Symfony\Component\HttpFoundation\Request;

lib/RoadizCoreBundle/src/Entity/Log.php → lib/RoadizCoreBundle/src/Logger/Entity/Log.php

@@ -2,12 +2,14 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\CoreBundle\Entity;
+namespace RZ\Roadiz\CoreBundle\Logger\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use JMS\Serializer\Annotation as Serializer;
 use Monolog\Logger;
 use RZ\Roadiz\Core\AbstractEntities\AbstractEntity;
-use JMS\Serializer\Annotation as Serializer;
+use RZ\Roadiz\CoreBundle\Entity\NodesSources;
+use RZ\Roadiz\CoreBundle\Entity\User;
 use RZ\Roadiz\CoreBundle\Repository\LogRepository;
 use Symfony\Component\Serializer\Annotation as SymfonySerializer;
 use Symfony\Component\Validator\Constraints as Assert;

lib/RoadizCoreBundle/src/Repository/LogRepository.php

@@ -8,9 +8,9 @@
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\Tools\Pagination\Paginator;
 use Doctrine\Persistence\ManagerRegistry;
-use RZ\Roadiz\CoreBundle\Entity\Log;
 use RZ\Roadiz\CoreBundle\Entity\Node;
 use RZ\Roadiz\CoreBundle\Entity\NodesSources;
+use RZ\Roadiz\CoreBundle\Logger\Entity\Log;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**

lib/RoadizCoreBundle/src/Repository/NodesSourcesRepository.php

@@ -14,10 +14,10 @@
 use RZ\Roadiz\CoreBundle\Doctrine\Event\QueryBuilder\QueryBuilderNodesSourcesBuildEvent;
 use RZ\Roadiz\CoreBundle\Doctrine\Event\QueryNodesSourcesEvent;
 use RZ\Roadiz\CoreBundle\Doctrine\ORM\SimpleQueryBuilder;
-use RZ\Roadiz\CoreBundle\Entity\Log;
 use RZ\Roadiz\CoreBundle\Entity\Node;
 use RZ\Roadiz\CoreBundle\Entity\NodesSources;
 use RZ\Roadiz\CoreBundle\Exception\SolrServerNotAvailableException;
+use RZ\Roadiz\CoreBundle\Logger\Entity\Log;
 use RZ\Roadiz\CoreBundle\Preview\PreviewResolverInterface;
 use RZ\Roadiz\CoreBundle\SearchEngine\NodeSourceSearchHandlerInterface;
 use RZ\Roadiz\CoreBundle\SearchEngine\SearchResultsInterface;

lib/RoadizCoreBundle/src/TwigExtension/LogExtension.php

@@ -5,15 +5,14 @@
 namespace RZ\Roadiz\CoreBundle\TwigExtension;
 
 use RZ\Roadiz\CoreBundle\Entity\CustomForm;
-use RZ\Roadiz\CoreBundle\Entity\CustomFormField;
 use RZ\Roadiz\CoreBundle\Entity\Document;
-use RZ\Roadiz\CoreBundle\Entity\Log;
 use RZ\Roadiz\CoreBundle\Entity\Node;
 use RZ\Roadiz\CoreBundle\Entity\NodesSources;
 use RZ\Roadiz\CoreBundle\Entity\Setting;
 use RZ\Roadiz\CoreBundle\Entity\Tag;
 use RZ\Roadiz\CoreBundle\Entity\Translation;
 use RZ\Roadiz\CoreBundle\Entity\User;
+use RZ\Roadiz\CoreBundle\Logger\Entity\Log;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Security;
 use Twig\Extension\AbstractExtension;

lib/RoadizRozierBundle/src/Controller/Node/NodesTagsController.php

@@ -14,7 +14,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Themes\Rozier\Forms\NodeTagsType;
 use Themes\Rozier\RozierApp;
 use Themes\Rozier\Traits\NodesTrait;
 

lib/Rozier/src/AjaxControllers/AjaxAbstractFieldsController.php

@@ -10,9 +10,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 abstract class AjaxAbstractFieldsController extends AbstractAjaxController
 {
     private HandlerFactoryInterface $handlerFactory;

lib/Rozier/src/AjaxControllers/AjaxCustomFormFieldsController.php

@@ -8,9 +8,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxCustomFormFieldsController extends AjaxAbstractFieldsController
 {
     /**

lib/Rozier/src/AjaxControllers/AjaxCustomFormsExplorerController.php

@@ -13,9 +13,6 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Themes\Rozier\Models\CustomFormModel;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxCustomFormsExplorerController extends AbstractAjaxController
 {
     private UrlGeneratorInterface $urlGenerator;

lib/Rozier/src/AjaxControllers/AjaxDocumentsExplorerController.php

@@ -16,9 +16,6 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Themes\Rozier\Models\DocumentModel;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxDocumentsExplorerController extends AbstractAjaxController
 {
     private RendererInterface $renderer;

lib/Rozier/src/AjaxControllers/AjaxEntitiesExplorerController.php

@@ -26,9 +26,6 @@
 use Themes\Rozier\Explorer\SettingExplorerItem;
 use Themes\Rozier\Explorer\UserExplorerItem;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxEntitiesExplorerController extends AbstractAjaxController
 {
     private RendererInterface $renderer;

lib/Rozier/src/AjaxControllers/AjaxExplorerProviderController.php

@@ -15,9 +15,6 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Exception\InvalidParameterException;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxExplorerProviderController extends AbstractAjaxController
 {
     private ContainerInterface $psrContainer;

lib/Rozier/src/AjaxControllers/AjaxFolderTreeController.php

@@ -10,9 +10,6 @@
 use Themes\Rozier\Widgets\FolderTreeWidget;
 use Themes\Rozier\Widgets\TreeWidgetFactory;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxFolderTreeController extends AbstractAjaxController
 {
     private TreeWidgetFactory $treeWidgetFactory;