From 3b193812fd669228cabc59d21085d21ab32e0718 Mon Sep 17 00:00:00 2001 From: Jan Rosier Date: Wed, 13 Mar 2019 16:51:10 +0100 Subject: [PATCH] Drop support for Symfony < 3.4 --- Registry.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Registry.php b/Registry.php index 4961a8012..0ce8cd2aa 100644 --- a/Registry.php +++ b/Registry.php @@ -6,10 +6,9 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\ORMException; +use Psr\Container\ContainerInterface; use Symfony\Bridge\Doctrine\ManagerRegistry; use Symfony\Bridge\Doctrine\RegistryInterface; -use Symfony\Component\DependencyInjection\ContainerAwareTrait; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * References all Doctrine connections and entity managers in a given Container. @@ -24,14 +23,7 @@ class Registry extends ManagerRegistry implements RegistryInterface */ public function __construct(ContainerInterface $container, array $connections, array $entityManagers, $defaultConnection, $defaultEntityManager) { - $parentTraits = class_uses(parent::class); - if (isset($parentTraits[ContainerAwareTrait::class])) { - // this case should be removed when Symfony 3.4 becomes the lowest supported version - // and then also, the constructor should type-hint Psr\Container\ContainerInterface - $this->setContainer($container); - } else { - $this->container = $container; - } + $this->container = $container; parent::__construct('ORM', $connections, $entityManagers, $defaultConnection, $defaultEntityManager, 'Doctrine\ORM\Proxy\Proxy'); }