fix issue 67

Author: ASKozienko

DependencyInjection/EnqueueExtension.php

@@ -8,11 +8,12 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-class EnqueueExtension extends Extension
+class EnqueueExtension extends Extension implements PrependExtensionInterface
 {
     /**
      * @var TransportFactoryInterface[]
@@ -132,4 +133,43 @@ public function getConfiguration(array $config, ContainerBuilder $container)
 
         return new Configuration($this->factories);
     }
+
+    public function prepend(ContainerBuilder $container)
+    {
+        $this->registerJobQueueDoctrineEntityMapping($container);
+    }
+
+    private function registerJobQueueDoctrineEntityMapping(ContainerBuilder $container)
+    {
+        if (false == class_exists(Job::class)) {
+            return;
+        }
+
+        $bundles = $container->getParameter('kernel.bundles');
+
+        if (false == isset($bundles['DoctrineBundle'])) {
+            return;
+        }
+
+        foreach ($container->getExtensionConfig('doctrine') as $config) {
+            // do not register mappings if dbal not configured.
+            if (false == empty($config['dbal'])) {
+                $rc = new \ReflectionClass(Job::class);
+                $jobQueueRootDir = dirname($rc->getFileName());
+                $container->prependExtensionConfig('doctrine', [
+                    'orm' => [
+                        'mappings' => [
+                            'enqueue_job_queue' => [
+                                'is_bundle' => false,
+                                'type' => 'xml',
+                                'dir' => $jobQueueRootDir.'/Doctrine/mapping',
+                                'prefix' => 'Enqueue\JobQueue\Doctrine\Entity',
+                            ],
+                        ],
+                    ],
+                ]);
+                break;
+            }
+        }
+    }
 }

Entity/Job.php

@@ -3,10 +3,10 @@ parameters:
 
 services:
     enqueue.job.storage:
-        class: 'Enqueue\JobQueue\JobStorage'
+        class: 'Enqueue\JobQueue\Doctrine\JobStorage'
         arguments:
             - '@doctrine'
-            - 'Enqueue\Bundle\Entity\Job'
+            - 'Enqueue\JobQueue\Doctrine\Entity\Job'
             - '%enqueue.job.unique_job_table_name%'
 
     enqueue.job.processor:

Entity/JobUnique.php

@@ -3,7 +3,7 @@
 namespace Enqueue\Bundle\Tests\Functional\Job;
 
 use Enqueue\Bundle\Tests\Functional\WebTestCase;
-use Enqueue\JobQueue\JobStorage;
+use Enqueue\JobQueue\Doctrine\JobStorage;
 
 /**
  * @group functional

Resources/config/job.yml

@@ -434,4 +434,47 @@ public function testShouldNotLoadSignalExtensionServiceIfDisabled()
 
         self::assertFalse($container->hasDefinition('enqueue.consumption.signal_extension'));
     }
+
+    public function testShouldAddJobQueueEntityMapping()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.bundles', ['DoctrineBundle' => true]);
+        $container->prependExtensionConfig('doctrine', ['dbal' => true]);
+
+        $extension = new EnqueueExtension();
+
+        $extension->prepend($container);
+
+        $expectedConfig = [
+            [
+                'orm' => [
+                    'mappings' => [
+                        'enqueue_job_queue' => [
+                            'is_bundle' => false,
+                            'type' => 'xml',
+                            'dir' => '/mqdev/pkg/job-queue/Doctrine/mapping',
+                            'prefix' => 'Enqueue\JobQueue\Doctrine\Entity',
+                        ],
+                    ],
+                ],
+            ],
+            [
+                'dbal' => true,
+            ],
+        ];
+
+        $this->assertSame($expectedConfig, $container->getExtensionConfig('doctrine'));
+    }
+
+    public function testShouldNotAddJobQueueEntityMappingIfDoctrineBundleIsNotRegistered()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.bundles', []);
+
+        $extension = new EnqueueExtension();
+
+        $extension->prepend($container);
+
+        $this->assertSame([], $container->getExtensionConfig('doctrine'));
+    }
 }