Merge pull request #988 from Baachi/feature/fix-doctrine-incompatiblity

Fix Incompatibility for doctrine

Author: makasim

Diff for: pkg/enqueue/Doctrine/DoctrineConnectionFactoryFactory.php

@@ -2,16 +2,16 @@
 
 namespace Enqueue\Doctrine;
 
+use Doctrine\Common\Persistence\ManagerRegistry;
 use Enqueue\ConnectionFactoryFactoryInterface;
 use Enqueue\Dbal\ManagerRegistryConnectionFactory;
 use Enqueue\Dsn\Dsn;
 use Interop\Queue\ConnectionFactory;
-use Symfony\Bridge\Doctrine\RegistryInterface;
 
 class DoctrineConnectionFactoryFactory implements ConnectionFactoryFactoryInterface
 {
     /**
-     * @var RegistryInterface
+     * @var ManagerRegistry
      */
     private $doctrine;
 
@@ -20,7 +20,7 @@ class DoctrineConnectionFactoryFactory implements ConnectionFactoryFactoryInterf
      */
     private $fallbackFactory;
 
-    public function __construct(RegistryInterface $doctrine, ConnectionFactoryFactoryInterface $fallbackFactory)
+    public function __construct(ManagerRegistry $doctrine, ConnectionFactoryFactoryInterface $fallbackFactory)
     {
         $this->doctrine = $doctrine;
         $this->fallbackFactory = $fallbackFactory;

Diff for: pkg/enqueue/Tests/DoctrineConnectionFactoryFactoryTest.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Enqueue\Tests;
+
+use Doctrine\Common\Persistence\ManagerRegistry;
+use Enqueue\ConnectionFactoryFactoryInterface;
+use Enqueue\Dbal\ManagerRegistryConnectionFactory;
+use Enqueue\Doctrine\DoctrineConnectionFactoryFactory;
+
+class DoctrineConnectionFactoryFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ManagerRegistry|\Prophecy\Prophecy\ObjectProphecy
+     */
+    private $registry;
+    /**
+     * @var ConnectionFactoryFactoryInterface|\Prophecy\Prophecy\ObjectProphecy
+     */
+    private $fallbackFactory;
+    /**
+     * @var DoctrineConnectionFactoryFactory
+     */
+    private $factory;
+
+    protected function setUp()
+    {
+        $this->registry = $this->prophesize(ManagerRegistry::class);
+        $this->fallbackFactory = $this->prophesize(ConnectionFactoryFactoryInterface::class);
+
+        $this->factory = new DoctrineConnectionFactoryFactory($this->registry->reveal(), $this->fallbackFactory->reveal());
+    }
+
+    public function testCreateWithoutArray()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('The config must be either array or DSN string.');
+
+        $this->factory->create(true);
+    }
+
+    public function testCreateWithoutDsn()
+    {
+        $this->expectExceptionMessage(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('The config must have dsn key set.');
+
+        $this->factory->create(['foo' => 'bar']);
+    }
+
+    public function testCreateWithDoctrineSchema()
+    {
+        $this->assertInstanceOf(
+            ManagerRegistryConnectionFactory::class,
+            $this->factory->create('doctrine://localhost:3306')
+        );
+    }
+
+    public function testCreateFallback()
+    {
+        $this->fallbackFactory
+            ->create(['dsn' => 'fallback://'])
+            ->shouldBeCalled();
+
+        $this->factory->create(['dsn' => 'fallback://']);
+    }
+}