bug #34981 stop using deprecated Doctrine persistence classes (xabbuh)

nicolas-grekas · nicolas-grekas · commit 2b40bb4f4ee5 · 2019-12-15T10:51:14.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- stop using deprecated Doctrine persistence classes | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- 4db5f02 stop using deprecated Doctrine persistence classes
diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
@@ -12,17 +12,32 @@
 namespace Symfony\Bridge\Doctrine;
 
 use Doctrine\Common\Persistence\AbstractManagerRegistry as LegacyAbstractManagerRegistry;
+use Doctrine\Persistence\AbstractManagerRegistry;
 use ProxyManager\Proxy\LazyLoadingInterface;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface as SymfonyContainerInterface;
 
+if (class_exists(AbstractManagerRegistry::class)) {
+    abstract class ManagerRegistry extends AbstractManagerRegistry implements ContainerAwareInterface
+    {
+        use ManagerRegistryTrait;
+    }
+} else {
+    abstract class ManagerRegistry extends LegacyAbstractManagerRegistry implements ContainerAwareInterface
+    {
+        use ManagerRegistryTrait;
+    }
+}
+
 /**
  * References Doctrine connections and entity/document managers.
  *
  * @author  Lukas Kahwe Smith <smith@pooteeweet.org>
+ *
+ * @internal
  */
-abstract class ManagerRegistry extends LegacyAbstractManagerRegistry implements ContainerAwareInterface
+trait ManagerRegistryTrait
 {
     /**
      * @var Container
