From ce6a5ad235b0e06b0ac8fc121d46e68d33dd70ed Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Thu, 4 Jul 2019 02:03:26 +0200
Subject: [PATCH] Use ConnectionRegistry instead of RegistryInterface.

---
 .../Transport/Doctrine/DoctrineTransportFactoryTest.php   | 8 ++++----
 .../Transport/Doctrine/DoctrineTransportFactory.php       | 4 ++--
 src/Symfony/Component/Messenger/composer.json             | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineTransportFactoryTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineTransportFactoryTest.php
index 9129ac6299803..cdde9284d7551 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineTransportFactoryTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineTransportFactoryTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Messenger\Tests\Transport\Doctrine;
 
+use Doctrine\Common\Persistence\ConnectionRegistry;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\Doctrine\RegistryInterface;
 use Symfony\Component\Messenger\Transport\Doctrine\Connection;
 use Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransport;
 use Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransportFactory;
@@ -23,7 +23,7 @@ class DoctrineTransportFactoryTest extends TestCase
     public function testSupports()
     {
         $factory = new DoctrineTransportFactory(
-            $this->getMockBuilder(RegistryInterface::class)->getMock()
+            $this->getMockBuilder(ConnectionRegistry::class)->getMock()
         );
 
         $this->assertTrue($factory->supports('doctrine://default', []));
@@ -35,7 +35,7 @@ public function testCreateTransport()
         $connection = $this->getMockBuilder(\Doctrine\DBAL\Connection::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $registry = $this->getMockBuilder(RegistryInterface::class)->getMock();
+        $registry = $this->getMockBuilder(ConnectionRegistry::class)->getMock();
         $registry->expects($this->once())
             ->method('getConnection')
             ->willReturn($connection);
@@ -55,7 +55,7 @@ public function testCreateTransport()
      */
     public function testCreateTransportMustThrowAnExceptionIfManagerIsNotFound()
     {
-        $registry = $this->getMockBuilder(RegistryInterface::class)->getMock();
+        $registry = $this->getMockBuilder(ConnectionRegistry::class)->getMock();
         $registry->expects($this->once())
             ->method('getConnection')
             ->willReturnCallback(function () {
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php
index 54ca901eb2ab7..9d7676353d71d 100644
--- a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php
+++ b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Messenger\Transport\Doctrine;
 
-use Symfony\Bridge\Doctrine\RegistryInterface;
+use Doctrine\Common\Persistence\ConnectionRegistry;
 use Symfony\Component\Messenger\Exception\TransportException;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
@@ -24,7 +24,7 @@ class DoctrineTransportFactory implements TransportFactoryInterface
 {
     private $registry;
 
-    public function __construct(RegistryInterface $registry)
+    public function __construct(ConnectionRegistry $registry)
     {
         $this->registry = $registry;
     }
diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json
index 77a0e456af258..9d8bd56ad905b 100644
--- a/src/Symfony/Component/Messenger/composer.json
+++ b/src/Symfony/Component/Messenger/composer.json
@@ -25,7 +25,6 @@
         "symfony/console": "^3.4|^4.0|^5.0",
         "symfony/dependency-injection": "^3.4.19|^4.1.8|^5.0",
         "symfony/error-catcher": "^4.4|^5.0",
-        "symfony/doctrine-bridge": "^3.4|^4.0|^5.0",
         "symfony/event-dispatcher": "^4.3|^5.0",
         "symfony/http-kernel": "^4.4|^5.0",
         "symfony/process": "^3.4|^4.0|^5.0",