8000 Merge branch '5.0' · symfony/symfony@9393c5d · GitHub
[go: up one dir, main page]

Skip to content

Commit 9393c5d

Browse files
Merge branch '5.0'
* 5.0: Fix merge
2 parents 331765b + e828253 commit 9393c5d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ public function testCreateFormBuilder()
532532

533533
public function testGetDoctrine()
534534
{
535-
$doctrine = $this->getMockBuilder(interface_exists(ManagerRegistry::class) ? ManagerRegistry::class : LegacyManagerRegistry::class)->getMock();
535+
$doctrine = $this->getMockBuilder('Doctrine\Persistence\ManagerRegistry')->getMock();
536536

537537
$container = new Container();
538538
$container->set('doctrine', $doctrine);

0 commit comments

Comments
 (0)
0