diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '5.0'

Browse Source 
* 5.0:
  Fix merge
This commit is contained in:
Nicolas Grekas 2019-12-12 16:25:11 +01:00
commit 9393c5d091
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
View File

@ -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);