Merge pull request #1050 from nicolas-grekas/autow

Restore autowiring alias for ManagerRegistry
doctrine · Nov 12, 2019 · bd2bb65 · bd2bb65
2 parents 9229915 + 481b3b9
commit bd2bb65
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/Repository/ServiceEntityRepository.php b/Repository/ServiceEntityRepository.php
@@ -14,7 +14,7 @@
  *
  * class YourEntityRepository extends ServiceEntityRepository
  * {
- *     public function __construct(Registry $registry)
+ *     public function __construct(ManagerRegistry $registry)
  *     {
  *         parent::__construct($registry, YourEntity::class);
  *     }

diff --git a/Resources/config/dbal.xml b/Resources/config/dbal.xml
@@ -64,7 +64,7 @@
             <argument>%doctrine.default_connection%</argument>
             <argument>%doctrine.default_entity_manager%</argument>
         </service>
-        <service id="Doctrine\Bundle\DoctrineBundle\Registry" alias="doctrine" public="false" />
+        <service id="Doctrine\Common\Persistence\ManagerRegistry" 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/...n/Fixtures/Bundles/RepositoryServiceBundle/Repository/TestCustomServiceRepoRepository.php b/...n/Fixtures/Bundles/RepositoryServiceBundle/Repository/TestCustomServiceRepoRepository.php
@@ -2,13 +2,13 @@
 
 namespace Fixtures\Bundles\RepositoryServiceBundle\Repository;
 
-use Doctrine\Bundle\DoctrineBundle\Registry;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Common\Persistence\ManagerRegistry;
 use Fixtures\Bundles\RepositoryServiceBundle\Entity\TestCustomServiceRepoEntity;
 
 class TestCustomServiceRepoRepository extends ServiceEntityRepository
 {
-    public function __construct(Registry $registry)
+    public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, TestCustomServiceRepoEntity::class);
     }

diff --git a/UPGRADE-2.0.md b/UPGRADE-2.0.md
@@ -44,9 +44,8 @@ Registry
 Service aliases
 ---------------
 
- * The `Doctrine\Common\Persistence\ManagerRegistry` and
-   `Symfony\Bridge\Doctrine\RegistryInterface` interfaces are no longer aliased
-   to the `doctrine` service, use `Doctrine\Bundle\DoctrineBundle\Registry`
+ * The `Symfony\Bridge\Doctrine\RegistryInterface` interface is no longer aliased
+   to the `doctrine` service, use `Doctrine\Common\Persistence\ManagerRegistry`
    instead.
  * The `Doctrine\Common\Persistence\ObjectManager` interface is no longer
    aliased to the `doctrine.orm.entity_manager` service, use