Fix merge
This commit is contained in:
parent
9a88f527a6
commit
e8282537c0
@ -532,7 +532,7 @@ class AbstractControllerTest extends TestCase
|
|||||||
|
|
||||||
public function testGetDoctrine()
|
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 = new Container();
|
||||||
$container->set('doctrine', $doctrine);
|
$container->set('doctrine', $doctrine);
|
||||||
|
Reference in New Issue
Block a user