Merge branch '5.0'

nicolas-grekas · nicolas-grekas · commit 9393c5d09139 · 2019-12-12T16:25:11.000+01:00
* 5.0:
  Fix merge
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
@@ -532,7 +532,7 @@ public function testCreateFormBuilder()
 
     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);

Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,7 @@ public function testCreateFormBuilder()`
`532`	`532`
`533`	`533`	`public function testGetDoctrine()`
`534`	`534`	`{`
`535`		`- $doctrine = $this->getMockBuilder(interface_exists(ManagerRegistry::class) ? ManagerRegistry::class : LegacyManagerRegistry::class)->getMock();`
	`535`	`+ $doctrine = $this->getMockBuilder('Doctrine\Persistence\ManagerRegistry')->getMock();`
`536`	`536`
`537`	`537`	`$container = new Container();`
`538`	`538`	`$container->set('doctrine', $doctrine);`