From e8282537c053470786513a5f9b38a59310df0487 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 12 Dec 2019 16:25:01 +0100
Subject: [PATCH] Fix merge

---
 .../FrameworkBundle/Tests/Controller/AbstractControllerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
index 96bbba8fed..0b30d684d8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
@@ -532,7 +532,7 @@ class AbstractControllerTest extends TestCase
 
     public function testGetDoctrine()
     {
-        $doctrine = $this->getMockBuilder(interface_exists(ManagerRegistry::class) ? ManagerRegistry::class : LegacyManagerRegistry::class)->getMock();
+        $doctrine = $this->getMockBuilder('Doctrine\Persistence\ManagerRegistry')->getMock();
 
         $container = new Container();
         $container->set('doctrine', $doctrine);