From 8b73a04a1b974fced93314a284c4ab6b364b0463 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Thu, 19 Apr 2018 09:52:27 -0400
Subject: [PATCH 1/2] Revert "Remove aliases for common interfaces"

This reverts commit 1e2ac46ad7208220a99ebdaa85f10889a16a592e.
---
 Resources/config/dbal.xml                           | 1 +
 Resources/config/orm.xml                            | 1 +
 Tests/DependencyInjection/DoctrineExtensionTest.php | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/Resources/config/dbal.xml b/Resources/config/dbal.xml
index 2053b4925..918839221 100644
--- a/Resources/config/dbal.xml
+++ b/Resources/config/dbal.xml
@@ -63,6 +63,7 @@
             <argument>%doctrine.default_connection%</argument>
             <argument>%doctrine.default_entity_manager%</argument>
         </service>
+        <service id="Doctrine\Common\Persistence\ManagerRegistry" alias="doctrine" public="false" />
         <service id="Symfony\Bridge\Doctrine\RegistryInterface" alias="doctrine" public="false" />
 
         <service id="doctrine.twig.doctrine_extension" class="Doctrine\Bundle\DoctrineBundle\Twig\DoctrineExtension" public="false">
diff --git a/Resources/config/orm.xml b/Resources/config/orm.xml
index 4c2af762b..5763e1905 100644
--- a/Resources/config/orm.xml
+++ b/Resources/config/orm.xml
@@ -75,6 +75,7 @@
     </parameters>
 
     <services>
+        <service id="Doctrine\Common\Persistence\ObjectManager" alias="doctrine.orm.entity_manager" public="false" />
         <service id="Doctrine\ORM\EntityManagerInterface" alias="doctrine.orm.entity_manager" public="false" />
 
         <!--- Deprecated Annotation Metadata Reader Service alias, use annotation_reader service -->
diff --git a/Tests/DependencyInjection/DoctrineExtensionTest.php b/Tests/DependencyInjection/DoctrineExtensionTest.php
index 03587078f..5ba6b1e2a 100644
--- a/Tests/DependencyInjection/DoctrineExtensionTest.php
+++ b/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -30,6 +30,8 @@ public function testAutowiringAlias()
         $expectedAliases = [
             DriverConnection::class => 'database_connection',
             Connection::class => 'database_connection',
+            ManagerRegistry::class => 'doctrine',
+            ObjectManager::class => 'doctrine.orm.entity_manager',
             EntityManagerInterface::class => 'doctrine.orm.entity_manager',
         ];
 

From 288a5ee90848c3cb8c42c836ae87cbd28b8c117e Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Thu, 19 Apr 2018 09:58:44 -0400
Subject: [PATCH 2/2] missing use statements

---
 Tests/DependencyInjection/DoctrineExtensionTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Tests/DependencyInjection/DoctrineExtensionTest.php b/Tests/DependencyInjection/DoctrineExtensionTest.php
index 5ba6b1e2a..a3e1c7dbe 100644
--- a/Tests/DependencyInjection/DoctrineExtensionTest.php
+++ b/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -4,6 +4,8 @@
 
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension;
 use Doctrine\Bundle\DoctrineBundle\Tests\Builder\BundleConfigurationBuilder;
+use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\Proxy\AbstractProxyFactory;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\Connection as DriverConnection;