Deprecated alias on DI Extension

doctrine · Nov 28, 2019 · 728f74d · 728f74d
1 parent 1035bdd
commit 728f74d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
@@ -92,6 +92,12 @@ protected function dbalLoad(array $config, ContainerBuilder $container)
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('dbal.xml');
 
+        // Deprecated
+        if (method_exists(Alias::class, 'setDeprecated')) {
+            $container->getAlias('Symfony\Bridge\Doctrine\RegistryInterface')->setDeprecated(true, 'The "%alias_id%" service alias is deprecated, use `Doctrine\Common\Persistence\ManagerRegistry` instead.');
+            $container->getAlias('Doctrine\Bundle\DoctrineBundle\Registry')->setDeprecated(true, 'The "%alias_id%" service alias is deprecated, use `Doctrine\Common\Persistence\ManagerRegistry` instead.');
+        }
+
         if (empty($config['default_connection'])) {
             $keys                         = array_keys($config['connections']);
             $config['default_connection'] = reset($keys);
@@ -348,6 +354,11 @@ protected function ormLoad(array $config, ContainerBuilder $container)
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('orm.xml');
 
+        // Deprecated
+        if (method_exists(Alias::class, 'setDeprecated')) {
+            $container->getAlias('Doctrine\Common\Persistence\ObjectManager')->setDeprecated(true, 'The "%alias_id%" service alias is deprecated, use `Doctrine\ORM\EntityManagerInterface` instead.');
+        }
+
         if (class_exists(AbstractType::class)) {
             $container->getDefinition('form.type.entity')->addTag('kernel.reset', ['method' => 'reset']);
         }

diff --git a/Resources/config/dbal.xml b/Resources/config/dbal.xml
@@ -65,12 +65,8 @@
             <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">
-            <deprecated>The "%alias_id%" service alias is deprecated, use `Doctrine\Common\Persistence\ManagerRegistry` instead.</deprecated>
-        </service>
-        <service id="Doctrine\Bundle\DoctrineBundle\Registry" alias="doctrine" public="false">
-            <deprecated>The "%alias_id%" service alias is deprecated, use `Doctrine\Common\Persistence\ManagerRegistry` instead.</deprecated>
-        </service>
+        <service id="Symfony\Bridge\Doctrine\RegistryInterface" alias="doctrine" public="false" />
+        <service id="Doctrine\Bundle\DoctrineBundle\Registry" alias="doctrine" public="false" />
 
         <service id="doctrine.twig.doctrine_extension" class="Doctrine\Bundle\DoctrineBundle\Twig\DoctrineExtension" public="false">
             <tag name="twig.extension" />

diff --git a/Resources/config/orm.xml b/Resources/config/orm.xml
@@ -75,9 +75,7 @@
     </parameters>
 
     <services>
-        <service id="Doctrine\Common\Persistence\ObjectManager" alias="doctrine.orm.entity_manager" public="false">
-            <deprecated>The "%alias_id%" service alias is deprecated, use `Doctrine\ORM\EntityManagerInterface` instead.</deprecated>
-        </service>
+        <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 -->