Fix merge

This commit is contained in:
Nicolas Grekas 2019-12-12 16:25:01 +01:00
parent 9a88f527a6
commit e8282537c0

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