Changed: use config setting to disable default mapping

Author: balabis

docs/bundle/config_reference.md

@@ -67,7 +67,7 @@ enqueue:
             queue_name:           ~
         job:
             enabled:              false
-            entity_manager_name:  ~
+            default_mapping:      true
         async_events:
             enabled:              false
         extensions:

docs/bundle/job_queue.md

@@ -61,9 +61,20 @@ enqueue:
 
         job: true
 
-        # by default bundle will add a default orm mapping configuration 
-        # if you define custom mappings, you can specify which entity manager to use here 
-        entity_manager_name: ~
+        # if you configure doctrine mapping yourself, disable default mapping
+        default_mapping: false
+
+doctrine:
+    # plus basic bundle configuration
+
+    orm:
+        mappings:
+            EnqueueJobQueue:
+                is_bundle: false
+                type: xml
+                dir: '%kernel.project_dir%/vendor/enqueue/job-queue/Doctrine/mapping'
+                prefix: 'Enqueue\JobQueue\Doctrine\Entity'
+
 ```
 
 * Run doctrine schema update command

pkg/enqueue-bundle/DependencyInjection/Configuration.php

@@ -95,7 +95,7 @@ private function getJobConfiguration(): ArrayNodeDefinition
 
         return (new ArrayNodeDefinition('job'))
             ->children()
-                ->scalarNode('entity_manager_name')->defaultNull()->end()
+                ->booleanNode('default_mapping')->defaultTrue()->end()
             ->end()
             ->addDefaultsIfNotSet()
             ->canBeEnabled()

pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php

@@ -98,11 +98,6 @@ public function load(array $configs, ContainerBuilder $container): void
                     throw new \LogicException('Job-queue supports only default configuration.');
                 }
 
-                $container->setParameter(
-                    'enqueue.job.entity_manager_name',
-                    $modules['job']['entity_manager_name']
-                );
-
                 $loader->load('job.yml');
             }
 
@@ -176,6 +171,14 @@ private function registerJobQueueDoctrineEntityMapping(ContainerBuilder $contain
             return;
         }
 
+        foreach ($container->getExtensionConfig('enqueue') as $modules) {
+            foreach ($modules as $config) {
+                if (isset($config['job']) && false === $config['job']['default_mapping']) {
+                    return;
+                }
+            }
+        }
+
         foreach ($container->getExtensionConfig('doctrine') as $config) {
             // do not register mappings if dbal not configured.
             if (!empty($config['dbal'])) {

pkg/enqueue-bundle/Resources/config/job.yml

@@ -9,7 +9,6 @@ services:
             - '@doctrine'
             - 'Enqueue\JobQueue\Doctrine\Entity\Job'
             - '%enqueue.job.unique_job_table_name%'
-            - '%enqueue.job.entity_manager_name%'
 
     # Deprecated. To be removed in 0.10.
     enqueue.job.storage:

pkg/job-queue/Doctrine/JobStorage.php

@@ -46,14 +46,12 @@ class JobStorage
     /**
      * @param string $entityClass
      * @param string $uniqueTableName
-     * @param mixed  $entityManagerName
      */
-    public function __construct(ManagerRegistry $doctrine, $entityClass, $uniqueTableName, $entityManagerName = null)
+    public function __construct(ManagerRegistry $doctrine, $entityClass, $uniqueTableName)
     {
         $this->doctrine = $doctrine;
         $this->entityClass = $entityClass;
         $this->uniqueTableName = $uniqueTableName;
-        $this->entityManagerName = $entityManagerName;
     }
 
     /**
@@ -204,9 +202,7 @@ private function getEntityRepository()
     private function getEntityManager()
     {
         if (!$this->em) {
-            $this->em = empty($this->entityManagerName)
-                ? $this->doctrine->getManagerForClass($this->entityClass)
-                : $this->doctrine->getManager($this->entityManagerName);
+            $this->em = $this->doctrine->getManagerForClass($this->entityClass);
         }
         if (!$this->em->isOpen()) {
             $this->em = $this->doctrine->resetManager();