Skip to content

Commit 85a27fe

Browse files
OskarStarknicolas-grekas
OskarStark
authored and
nicolas-grekas
committed
Use createMock() and use import instead of FQCN
1 parent e84e046 commit 85a27fe

22 files changed

+90
-66
lines changed

‎Tests/AppVariableTest.php‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
use PHPUnit\Framework\TestCase;
66
use Symfony\Bridge\Twig\AppVariable;
77
use Symfony\Component\HttpFoundation\Request;
8+
use Symfony\Component\HttpFoundation\RequestStack;
89
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
910
use Symfony\Component\HttpFoundation\Session\Session;
11+
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
12+
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
13+
use Symfony\Component\Security\Core\User\UserInterface;
1014

1115
class AppVariableTest extends TestCase
1216
{
@@ -50,7 +54,7 @@ public function testEnvironment()
5054
*/
5155
public function testGetSession()
5256
{
53-
$request = $this->getMockBuilder(Request::class)->getMock();
57+
$request = $this->createMock(Request::class);
5458
$request->method('hasSession')->willReturn(true);
5559
$request->method('getSession')->willReturn($session = new Session());
5660

@@ -75,18 +79,18 @@ public function testGetRequest()
7579

7680
public function testGetToken()
7781
{
78-
$tokenStorage = $this->getMockBuilder(\Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface::class)->getMock();
82+
$tokenStorage = $this->createMock(TokenStorageInterface::class);
7983
$this->appVariable->setTokenStorage($tokenStorage);
8084

81-
$token = $this->getMockBuilder(\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class)->getMock();
85+
$token = $this->createMock(TokenInterface::class);
8286
$tokenStorage->method('getToken')->willReturn($token);
8387

8488
$this->assertEquals($token, $this->appVariable->getToken());
8589
}
8690

8791
public function testGetUser()
8892
{
89-
$this->setTokenStorage($user = $this->getMockBuilder(\Symfony\Component\Security\Core\User\UserInterface::class)->getMock());
93+
$this->setTokenStorage($user = $this->createMock(UserInterface::class));
9094

9195
$this->assertEquals($user, $this->appVariable->getUser());
9296
}
@@ -100,15 +104,15 @@ public function testGetUserWithUsernameAsTokenUser()
100104

101105
public function testGetTokenWithNoToken()
102106
{
103-
$tokenStorage = $this->getMockBuilder(\Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface::class)->getMock();
107+
$tokenStorage = $this->createMock(TokenStorageInterface::class);
104108
$this->appVariable->setTokenStorage($tokenStorage);
105109

106110
$this->assertNull($this->appVariable->getToken());
107111
}
108112

109113
public function testGetUserWithNoToken()
110114
{
111-
$tokenStorage = $this->getMockBuilder(\Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface::class)->getMock();
115+
$tokenStorage = $this->createMock(TokenStorageInterface::class);
112116
$this->appVariable->setTokenStorage($tokenStorage);
113117

114118
$this->assertNull($this->appVariable->getUser());
@@ -224,18 +228,18 @@ public function testGetFlashes()
224228

225229
protected function setRequestStack($request)
226230
{
227-
$requestStackMock = $this->getMockBuilder(\Symfony\Component\HttpFoundation\RequestStack::class)->getMock();
231+
$requestStackMock = $this->createMock(RequestStack::class);
228232
$requestStackMock->method('getCurrentRequest')->willReturn($request);
229233

230234
$this->appVariable->setRequestStack($requestStackMock);
231235
}
232236

233237
protected function setTokenStorage($user)
234238
{
235-
$tokenStorage = $this->getMockBuilder(\Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface::class)->getMock();
239+
$tokenStorage = $this->createMock(TokenStorageInterface::class);
236240
$this->appVariable->setTokenStorage($tokenStorage);
237241

238-
$token = $this->getMockBuilder(\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class)->getMock();
242+
$token = $this->createMock(TokenInterface::class);
239243
$tokenStorage->method('getToken')->willReturn($token);
240244

241245
$token->method('getUser')->willReturn($user);
@@ -251,11 +255,11 @@ private function setFlashMessages($sessionHasStarted = true)
251255
$flashBag = new FlashBag();
252256
$flashBag->initialize($flashMessages);
253257

254-
$session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
258+
$session = $this->createMock(Session::class);
255259
$session->method('isStarted')->willReturn($sessionHasStarted);
256260
$session->method('getFlashBag')->willReturn($flashBag);
257261

258-
$request = $this->getMockBuilder(Request::class)->getMock();
262+
$request = $this->createMock(Request::class);
259263
$request->method('hasSession')->willReturn(true);
260264
$request->method('getSession')->willReturn($session);
261265
$this->setRequestStack($request);

‎Tests/Command/DebugCommandTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bridge\Twig\Command\DebugCommand;
1616
use Symfony\Component\Console\Application;
17+
use Symfony\Component\Console\Exception\InvalidArgumentException;
1718
use Symfony\Component\Console\Tester\CommandTester;
1819
use Twig\Environment;
1920
use Twig\Loader\ChainLoader;
@@ -91,7 +92,7 @@ public function testDeprecationForWrongBundleOverridingInLegacyPath()
9192

9293
public function testMalformedTemplateName()
9394
{
94-
$this->expectException(\Symfony\Component\Console\Exception\InvalidArgumentException::class);
95+
$this->expectException(InvalidArgumentException::class);
9596
$this->expectExceptionMessage('Malformed namespaced template name "@foo" (expecting "@namespace/template_name").');
9697
$this->createCommandTester()->execute(['name' => '@foo']);
9798
}

‎Tests/Extension/DumpExtensionTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Symfony\Component\VarDumper\VarDumper;
1919
use Twig\Environment;
2020
use Twig\Loader\ArrayLoader;
21+
use Twig\Loader\LoaderInterface;
2122

2223
class DumpExtensionTest extends TestCase
2324
{
@@ -67,7 +68,7 @@ public function getDumpTags()
6768
public function testDump($context, $args, $expectedOutput, $debug = true)
6869
{
6970
$extension = new DumpExtension(new VarCloner());
70-
$twig = new Environment($this->getMockBuilder(\Twig\Loader\LoaderInterface::class)->getMock(), [
71+
$twig = new Environment($this->createMock(LoaderInterface::class), [
7172
'debug' => $debug,
7273
'cache' => false,
7374
'optimizations' => 0,
@@ -124,7 +125,7 @@ public function testCustomDumper()
124125
'</pre><script>Sfdump("%s")</script>'
125126
);
126127
$extension = new DumpExtension(new VarCloner(), $dumper);
127-
$twig = new Environment($this->getMockBuilder(\Twig\Loader\LoaderInterface::class)->getMock(), [
128+
$twig = new Environment($this->createMock(LoaderInterface::class), [
128129
'debug' => true,
129130
'cache' => false,
130131
'optimizations' => 0,

‎Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
1919
use Symfony\Component\Form\FormRenderer;
2020
use Symfony\Component\Form\FormView;
21+
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
2122
use Twig\Environment;
2223

2324
class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3HorizontalLayoutTest
@@ -50,7 +51,7 @@ protected function setUp(): void
5051
'bootstrap_3_horizontal_layout.html.twig',
5152
'custom_widgets.html.twig',
5253
], $environment);
53-
$this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder(\Symfony\Component\Security\Csrf\CsrfTokenManagerInterface::class)->getMock());
54+
$this->renderer = new FormRenderer($rendererEngine, $this->createMock(CsrfTokenManagerInterface::class));
5455
$this->registerTwigRuntimeLoader($environment, $this->renderer);
5556
}
5657

‎Tests/Extension/FormExtensionBootstrap3LayoutTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
1919
use Symfony\Component\Form\FormRenderer;
2020
use Symfony\Component\Form\FormView;
21+
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
2122
use Twig\Environment;
2223

2324
class FormExtensionBootstrap3LayoutTest extends AbstractBootstrap3LayoutTest
@@ -46,7 +47,7 @@ protected function setUp(): void
4647
'bootstrap_3_layout.html.twig',
4748
'custom_widgets.html.twig',
4849
], $environment);
49-
$this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder(\Symfony\Component\Security\Csrf\CsrfTokenManagerInterface::class)->getMock());
50+
$this->renderer = new FormRenderer($rendererEngine, $this->createMock(CsrfTokenManagerInterface::class));
5051
$this->registerTwigRuntimeLoader($environment, $this->renderer);
5152
}
5253

@@ -88,7 +89,7 @@ public function testMoneyWidgetInIso()
8889
'bootstrap_3_layout.html.twig',
8990
'custom_widgets.html.twig',
9091
], $environment);
91-
$this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder(\Symfony\Component\Security\Csrf\CsrfTokenManagerInterface::class)->getMock());
92+
$this->renderer = new FormRenderer($rendererEngine, $this->createMock(CsrfTokenManagerInterface::class));
9293
$this->registerTwigRuntimeLoader($environment, $this->renderer);
9394

9495
$view = $this->factory

‎Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
1919
use Symfony\Component\Form\FormRenderer;
2020
use Symfony\Component\Form\FormView;
21+
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
2122
use Twig\Environment;
2223

2324
/**
@@ -52,7 +53,7 @@ protected function setUp(): void
5253
'bootstrap_4_horizontal_layout.html.twig',
5354
'custom_widgets.html.twig',
5455
], $environment);
55-
$this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder(\Symfony\Component\Security\Csrf\CsrfTokenManagerInterface::class)->getMock());
56+
$this->renderer = new FormRenderer($rendererEngine, $this->createMock(CsrfTokenManagerInterface::class));
5657
$this->registerTwigRuntimeLoader($environment, $this->renderer);
5758
}
5859

‎Tests/Extension/FormExtensionBootstrap4LayoutTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
1919
use Symfony\Component\Form\FormRenderer;
2020
use Symfony\Component\Form\FormView;
21+
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
2122
use Twig\Environment;
2223

2324
/**
@@ -50,7 +51,7 @@ protected function setUp(): void
5051
'bootstrap_4_layout.html.twig',
5152
'custom_widgets.html.twig',
5253
], $environment);
53-
$this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder(\Symfony\Component\Security\Csrf\CsrfTokenManagerInterface::class)->getMock());
54+
$this->renderer = new FormRenderer($rendererEngine, $this->createMock(CsrfTokenManagerInterface::class));
5455
$this->registerTwigRuntimeLoader($environment, $this->renderer);
5556
}
5657

@@ -92,7 +93,7 @@ public function testMoneyWidgetInIso()
9293
'bootstrap_4_layout.html.twig',
9394
'custom_widgets.html.twig',
9495
], $environment);
95-
$this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder(\Symfony\Component\Security\Csrf\CsrfTokenManagerInterface::class)->getMock());
96+
$this->renderer = new FormRenderer($rendererEngine, $this->createMock(CsrfTokenManagerInterface::class));
9697
$this->registerTwigRuntimeLoader($environment, $this->renderer);
9798

9899
$view = $this->factory

‎Tests/Extension/FormExtensionDivLayoutTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use Symfony\Component\Form\FormRenderer;
2121
use Symfony\Component\Form\FormView;
2222
use Symfony\Component\Form\Tests\AbstractDivLayoutTest;
23+
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
2324
use Twig\Environment;
2425

2526
class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
@@ -53,7 +54,7 @@ protected function setUp(): void
5354
'form_div_layout.html.twig',
5455
'custom_widgets.html.twig',
5556
], $environment);
56-
$this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder(\Symfony\Component\Security\Csrf\CsrfTokenManagerInterface::class)->getMock());
57+
$this->renderer = new FormRenderer($rendererEngine, $this->createMock(CsrfTokenManagerInterface::class));
5758
$this->registerTwigRuntimeLoader($environment, $this->renderer);
5859
}
5960

@@ -181,7 +182,7 @@ public function testMoneyWidgetInIso()
181182
'form_div_layout.html.twig',
182183
'custom_widgets.html.twig',
183184
], $environment);
184-
$this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder(\Symfony\Component\Security\Csrf\CsrfTokenManagerInterface::class)->getMock());
185+
$this->renderer = new FormRenderer($rendererEngine, $this->createMock(CsrfTokenManagerInterface::class));
185186
$this->registerTwigRuntimeLoader($environment, $this->renderer);
186187

187188
$view = $this->factory

‎Tests/Extension/FormExtensionTableLayoutTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Symfony\Component\Form\FormRenderer;
2020
use Symfony\Component\Form\FormView;
2121
use Symfony\Component\Form\Tests\AbstractTableLayoutTest;
22+
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
2223
use Twig\Environment;
2324

2425
class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
@@ -50,7 +51,7 @@ protected function setUp(): void
5051
'form_table_layout.html.twig',
5152
'custom_widgets.html.twig',
5253
], $environment);
53-
$this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder(\Symfony\Component\Security\Csrf\CsrfTokenManagerInterface::class)->getMock());
54+
$this->renderer = new FormRenderer($rendererEngine, $this->createMock(CsrfTokenManagerInterface::class));
5455
$this->registerTwigRuntimeLoader($environment, $this->renderer);
5556
}
5657

‎Tests/Extension/HttpKernelExtensionTest.php‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@
1515
use Symfony\Bridge\Twig\Extension\HttpKernelExtension;
1616
use Symfony\Bridge\Twig\Extension\HttpKernelRuntime;
1717
use Symfony\Component\HttpFoundation\Request;
18+
use Symfony\Component\HttpFoundation\RequestStack;
1819
use Symfony\Component\HttpFoundation\Response;
1920
use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
21+
use Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface;
2022
use Twig\Environment;
2123
use Twig\Loader\ArrayLoader;
24+
use Twig\RuntimeLoader\RuntimeLoaderInterface;
2225

2326
class HttpKernelExtensionTest extends TestCase
2427
{
@@ -41,10 +44,7 @@ public function testRenderFragment()
4144

4245
public function testUnknownFragmentRenderer()
4346
{
44-
$context = $this->getMockBuilder(\Symfony\Component\HttpFoundation\RequestStack::class)
45-
->disableOriginalConstructor()
46-
->getMock()
47-
;
47+
$context = $this->createMock(RequestStack::class);
4848
$renderer = new FragmentHandler($context);
4949

5050
$this->expectException(\InvalidArgumentException::class);
@@ -55,14 +55,11 @@ public function testUnknownFragmentRenderer()
5555

5656
protected function getFragmentHandler($return)
5757
{
58-
$strategy = $this->getMockBuilder(\Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface::class)->getMock();
58+
$strategy = $this->createMock(FragmentRendererInterface::class);
5959
$strategy->expects($this->once())->method('getName')->willReturn('inline');
6060
$strategy->expects($this->once())->method('render')->will($return);
6161

62-
$context = $this->getMockBuilder(\Symfony\Component\HttpFoundation\RequestStack::class)
63-
->disableOriginalConstructor()
64-
->getMock()
65-
;
62+
$context = $this->createMock(RequestStack::class);
6663

6764
$context->expects($this->any())->method('getCurrentRequest')->willReturn(Request::create('/'));
6865

@@ -75,7 +72,7 @@ protected function renderTemplate(FragmentHandler $renderer, $template = '{{ ren
7572
$twig = new Environment($loader, ['debug' => true, 'cache' => false]);
7673
$twig->addExtension(new HttpKernelExtension());
7774

78-
$loader = $this->getMockBuilder(\Twig\RuntimeLoader\RuntimeLoaderInterface::class)->getMock();
75+
$loader = $this->createMock(RuntimeLoaderInterface::class);
7976
$loader->expects($this->any())->method('load')->willReturnMap([
8077
['Symfony\Bridge\Twig\Extension\HttpKernelRuntime', new HttpKernelRuntime($renderer)],
8178
]);

0 commit comments

Comments
 (0)