Skip to content

Commit cd3712f

Browse files
fabpotfabpot
committed
fixed obsolete getMock() usage
1 parent 39a08da commit cd3712f

File tree

7 files changed

+23
-29
lines changed

7 files changed

+23
-29
lines changed

‎Tests/Controller/ArgumentResolverTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public function testGetVariadicArgumentsWithoutArrayInRequest()
190190
public function testGetArgumentWithoutArray()
191191
{
192192
$factory = new ArgumentMetadataFactory();
193-
$valueResolver = $this->getMock(ArgumentValueResolverInterface::class);
193+
$valueResolver = $this->getMockBuilder(ArgumentValueResolverInterface::class)->getMock();
194194
$resolver = new ArgumentResolver($factory, array($valueResolver));
195195

196196
$valueResolver->expects($this->any())->method('supports')->willReturn(true);

‎Tests/DataCollector/RequestDataCollectorTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function testCollect()
5858

5959
public function testKernelResponseDoesNotStartSession()
6060
{
61-
$kernel = $this->getMock(HttpKernelInterface::class);
61+
$kernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
6262
$request = new Request();
6363
$session = new Session(new MockArraySessionStorage());
6464
$request->setSession($session);
@@ -233,8 +233,8 @@ protected function createResponse()
233233
*/
234234
protected function injectController($collector, $controller, $request)
235235
{
236-
$resolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface');
237-
$httpKernel = new HttpKernel(new EventDispatcher(), $resolver, null, $this->getMock(ArgumentResolverInterface::class));
236+
$resolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface')->getMock();
237+
$httpKernel = new HttpKernel(new EventDispatcher(), $resolver, null, $this->getMockBuilder(ArgumentResolverInterface::class)->getMock());
238238
$event = new FilterControllerEvent($httpKernel, $controller, $request, HttpKernelInterface::MASTER_REQUEST);
239239
$collector->onKernelController($event);
240240
}

‎Tests/Debug/TraceableEventDispatcherTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ public function testListenerCanRemoveItselfWhenExecuted()
110110

111111
protected function getHttpKernel($dispatcher, $controller)
112112
{
113-
$controllerResolver = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface');
113+
$controllerResolver = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface')->getMock();
114114
$controllerResolver->expects($this->once())->method('getController')->will($this->returnValue($controller));
115-
$argumentResolver = $this->getMock('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface');
115+
$argumentResolver = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface')->getMock();
116116
$argumentResolver->expects($this->once())->method('getArguments')->will($this->returnValue(array()));
117117

118118
return new HttpKernel($dispatcher, $controllerResolver, new RequestStack(), $argumentResolver);

‎Tests/DependencyInjection/FragmentRendererPassTest.php

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,9 @@ public function testContentRendererWithoutInterface()
3030
'my_content_renderer' => array(array('alias' => 'foo')),
3131
);
3232

33-
$definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
33+
$definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
3434

35-
$builder = $this->getMock(
36-
'Symfony\Component\DependencyInjection\ContainerBuilder',
37-
array('hasDefinition', 'findTaggedServiceIds', 'getDefinition')
38-
);
35+
$builder = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
3936
$builder->expects($this->any())
4037
->method('hasDefinition')
4138
->will($this->returnValue(true));
@@ -59,14 +56,14 @@ public function testValidContentRenderer()
5956
'my_content_renderer' => array(array('alias' => 'foo')),
6057
);
6158

62-
$renderer = $this->getMock('Symfony\Component\DependencyInjection\Definition');
59+
$renderer = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
6360
$renderer
6461
->expects($this->once())
6562
->method('addMethodCall')
6663
->with('addRendererService', array('foo', 'my_content_renderer'))
6764
;
6865

69-
$definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
66+
$definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
7067
$definition->expects($this->atLeastOnce())
7168
->method('getClass')
7269
->will($this->returnValue('Symfony\Component\HttpKernel\Tests\DependencyInjection\RendererService'));
@@ -76,10 +73,7 @@ public function testValidContentRenderer()
7673
->will($this->returnValue(true))
7774
;
7875

79-
$builder = $this->getMock(
80-
'Symfony\Component\DependencyInjection\ContainerBuilder',
81-
array('hasDefinition', 'findTaggedServiceIds', 'getDefinition')
82-
);
76+
$builder = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
8377
$builder->expects($this->any())
8478
->method('hasDefinition')
8579
->will($this->returnValue(true));

‎Tests/EventListener/ProfilerListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testKernelTerminate()
3838
->method('collect')
3939
->will($this->returnValue($profile));
4040

41-
$kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
41+
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
4242

4343
$masterRequest = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
4444
->disableOriginalConstructor()

‎Tests/Fragment/InlineFragmentRendererTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function testRenderWithObjectsAsAttributes()
5757
*/
5858
public function testRenderWithObjectsAsAttributesPassedAsObjectsInTheControllerLegacy()
5959
{
60-
$resolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver', array('getController'));
60+
$resolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver')->setMethods(array('getController'))->getMock();
6161
$resolver
6262
->expects($this->once())
6363
->method('getController')
@@ -78,7 +78,7 @@ public function testRenderWithObjectsAsAttributesPassedAsObjectsInTheControllerL
7878
*/
7979
public function testRenderWithObjectsAsAttributesPassedAsObjectsInTheController()
8080
{
81-
$resolver = $this->getMock(ControllerResolverInterface::class);
81+
$resolver = $this->getMockBuilder(ControllerResolverInterface::class)->getMock();
8282
$resolver
8383
->expects($this->once())
8484
->method('getController')
@@ -111,7 +111,7 @@ public function testRenderWithTrustedHeaderDisabled()
111111
*/
112112
public function testRenderExceptionNoIgnoreErrors()
113113
{
114-
$dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
114+
$dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
115115
$dispatcher->expects($this->never())->method('dispatch');
116116

117117
$strategy = new InlineFragmentRenderer($this->getKernel($this->throwException(new \RuntimeException('foo'))), $dispatcher);
@@ -121,7 +121,7 @@ public function testRenderExceptionNoIgnoreErrors()
121121

122122
public function testRenderExceptionIgnoreErrors()
123123
{
124-
$dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
124+
$dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
125125
$dispatcher->expects($this->once())->method('dispatch')->with(KernelEvents::EXCEPTION);
126126

127127
$strategy = new InlineFragmentRenderer($this->getKernel($this->throwException(new \RuntimeException('foo'))), $dispatcher);
@@ -141,7 +141,7 @@ public function testRenderExceptionIgnoreErrorsWithAlt()
141141

142142
private function getKernel($returnValue)
143143
{
144-
$kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
144+
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
145145
$kernel
146146
->expects($this->any())
147147
->method('handle')
@@ -157,7 +157,7 @@ private function getKernel($returnValue)
157157
*/
158158
private function getKernelExpectingRequest(Request $request)
159159
{
160-
$kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
160+
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
161161
$kernel
162162
->expects($this->any())
163163
->method('handle')
@@ -169,7 +169,7 @@ private function getKernelExpectingRequest(Request $request)
169169

170170
public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()
171171
{
172-
$controllerResolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface');
172+
$controllerResolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface')->getMock();
173173
$controllerResolver
174174
->expects($this->once())
175175
->method('getController')
@@ -180,7 +180,7 @@ public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()
180180
}))
181181
;
182182

183-
$argumentResolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolverInterface');
183+
$argumentResolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolverInterface')->getMock();
184184
$argumentResolver
185185
->expects($this->once())
186186
->method('getArguments')

‎Tests/HttpKernelTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ public function testVerifyRequestStackPushPopDuringHandle()
292292
{
293293
$request = new Request();
294294

295-
$stack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack', array('push', 'pop'));
295+
$stack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->setMethods(array('push', 'pop'))->getMock();
296296
$stack->expects($this->at(0))->method('push')->with($this->equalTo($request));
297297
$stack->expects($this->at(1))->method('pop');
298298

@@ -328,13 +328,13 @@ private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $contr
328328
$controller = function () { return new Response('Hello'); };
329329
}
330330

331-
$controllerResolver = $this->getMock(ControllerResolverInterface::class);
331+
$controllerResolver = $this->getMockBuilder(ControllerResolverInterface::class)->getMock();
332332
$controllerResolver
333333
->expects($this->any())
334334
->method('getController')
335335
->will($this->returnValue($controller));
336336

337-
$argumentResolver = $this->getMock(ArgumentResolverInterface::class);
337+
$argumentResolver = $this->getMockBuilder(ArgumentResolverInterface::class)->getMock();
338338
$argumentResolver
339339
->expects($this->any())
340340
->method('getArguments')

0 commit comments

Comments
 (0)