Skip to content

Commit 71bd6d3

Browse files
derrabusderrabus
committed
Use willReturn() instead of will(returnValue()).
1 parent 7504c36 commit 71bd6d3

24 files changed

+102
-102
lines changed

‎Tests/CacheWarmer/CacheWarmerAggregateTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function testWarmupDoesNotCallWarmupOnOptionalWarmersWhenEnableOptionalWa
8787
$warmer
8888
->expects($this->once())
8989
->method('isOptional')
90-
->will($this->returnValue(true));
90+
->willReturn(true);
9191
$warmer
9292
->expects($this->never())
9393
->method('warmUp');

‎Tests/ClientTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public function testUploadedFileWhenSizeExceedsUploadMaxFileSize()
157157

158158
$file->expects($this->once())
159159
->method('getSize')
160-
->will($this->returnValue(INF))
160+
->willReturn(INF)
161161
;
162162

163163
$client->request('POST', '/', [], [$file]);

‎Tests/Config/FileLocatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function testLocate()
2323
->expects($this->atLeastOnce())
2424
->method('locateResource')
2525
->with('@BundleName/some/path', null, true)
26-
->will($this->returnValue('/bundle-name/some/path'));
26+
->willReturn('/bundle-name/some/path');
2727
$locator = new FileLocator($kernel);
2828
$this->assertEquals('/bundle-name/some/path', $locator->locate('@BundleName/some/path'));
2929

‎Tests/Controller/ContainerControllerResolverTest.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public function testGetControllerService()
2626
$container->expects($this->once())
2727
->method('has')
2828
->with('foo')
29-
->will($this->returnValue(true));
29+
->willReturn(true);
3030
$container->expects($this->once())
3131
->method('get')
3232
->with('foo')
33-
->will($this->returnValue($this))
33+
->willReturn($this)
3434
;
3535

3636
$resolver = $this->createControllerResolver(null, $container);
@@ -51,12 +51,12 @@ public function testGetControllerInvokableService()
5151
$container->expects($this->once())
5252
->method('has')
5353
->with('foo')
54-
->will($this->returnValue(true))
54+
->willReturn(true)
5555
;
5656
$container->expects($this->once())
5757
->method('get')
5858
->with('foo')
59-
->will($this->returnValue($invokableController))
59+
->willReturn($invokableController)
6060
;
6161

6262
$resolver = $this->createControllerResolver(null, $container);
@@ -77,12 +77,12 @@ public function testGetControllerInvokableServiceWithClassNameAsName()
7777
$container->expects($this->once())
7878
->method('has')
7979
->with($className)
80-
->will($this->returnValue(true))
80+
->willReturn(true)
8181
;
8282
$container->expects($this->once())
8383
->method('get')
8484
->with($className)
85-
->will($this->returnValue($invokableController))
85+
->willReturn($invokableController)
8686
;
8787

8888
$resolver = $this->createControllerResolver(null, $container);
@@ -100,7 +100,7 @@ public function testNonInstantiableController()
100100
$container->expects($this->once())
101101
->method('has')
102102
->with(NonInstantiableController::class)
103-
->will($this->returnValue(false))
103+
->willReturn(false)
104104
;
105105

106106
$resolver = $this->createControllerResolver(null, $container);
@@ -122,19 +122,19 @@ public function testNonConstructController()
122122
$container->expects($this->at(0))
123123
->method('has')
124124
->with(ImpossibleConstructController::class)
125-
->will($this->returnValue(true))
125+
->willReturn(true)
126126
;
127127

128128
$container->expects($this->at(1))
129129
->method('has')
130130
->with(ImpossibleConstructController::class)
131-
->will($this->returnValue(false))
131+
->willReturn(false)
132132
;
133133

134134
$container->expects($this->atLeastOnce())
135135
->method('getRemovedIds')
136136
->with()
137-
->will($this->returnValue([ImpossibleConstructController::class => true]))
137+
->willReturn([ImpossibleConstructController::class => true])
138138
;
139139

140140
$resolver = $this->createControllerResolver(null, $container);
@@ -162,12 +162,12 @@ public function testNonInstantiableControllerWithCorrespondingService()
162162
$container->expects($this->atLeastOnce())
163163
->method('has')
164164
->with(NonInstantiableController::class)
165-
->will($this->returnValue(true))
165+
->willReturn(true)
166166
;
167167
$container->expects($this->atLeastOnce())
168168
->method('get')
169169
->with(NonInstantiableController::class)
170-
->will($this->returnValue($service))
170+
->willReturn($service)
171171
;
172172

173173
$resolver = $this->createControllerResolver(null, $container);
@@ -189,13 +189,13 @@ public function testExceptionWhenUsingRemovedControllerService()
189189
$container->expects($this->at(0))
190190
->method('has')
191191
->with('app.my_controller')
192-
->will($this->returnValue(false))
192+
->willReturn(false)
193193
;
194194

195195
$container->expects($this->atLeastOnce())
196196
->method('getRemovedIds')
197197
->with()
198-
->will($this->returnValue(['app.my_controller' => true]))
198+
->willReturn(['app.my_controller' => true])
199199
;
200200

201201
$resolver = $this->createControllerResolver(null, $container);
@@ -215,12 +215,12 @@ public function testExceptionWhenUsingControllerWithoutAnInvokeMethod()
215215
$container->expects($this->once())
216216
->method('has')
217217
->with('app.my_controller')
218-
->will($this->returnValue(true))
218+
->willReturn(true)
219219
;
220220
$container->expects($this->once())
221221
->method('get')
222222
->with('app.my_controller')
223-
->will($this->returnValue(new ImpossibleConstructController('toto', 'controller')))
223+
->willReturn(new ImpossibleConstructController('toto', 'controller'))
224224
;
225225

226226
$resolver = $this->createControllerResolver(null, $container);

‎Tests/Controller/ControllerResolverTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public function testGetVariadicArguments()
226226
public function testCreateControllerCanReturnAnyCallable()
227227
{
228228
$mock = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ControllerResolver')->setMethods(['createController'])->getMock();
229-
$mock->expects($this->once())->method('createController')->will($this->returnValue('Symfony\Component\HttpKernel\Tests\Controller\some_controller_function'));
229+
$mock->expects($this->once())->method('createController')->willReturn('Symfony\Component\HttpKernel\Tests\Controller\some_controller_function');
230230

231231
$request = Request::create('/');
232232
$request->attributes->set('_controller', 'foobar');

‎Tests/DataCollector/LoggerDataCollectorTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public function testCollectWithUnexpectedFormat()
2323
->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')
2424
->setMethods(['countErrors', 'getLogs', 'clear'])
2525
->getMock();
26-
$logger->expects($this->once())->method('countErrors')->will($this->returnValue('foo'));
27-
$logger->expects($this->exactly(2))->method('getLogs')->will($this->returnValue([]));
26+
$logger->expects($this->once())->method('countErrors')->willReturn('foo');
27+
$logger->expects($this->exactly(2))->method('getLogs')->willReturn([]);
2828

2929
$c = new LoggerDataCollector($logger, __DIR__.'/');
3030
$c->lateCollect();
@@ -50,8 +50,8 @@ public function testCollect($nb, $logs, $expectedLogs, $expectedDeprecationCount
5050
->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')
5151
->setMethods(['countErrors', 'getLogs', 'clear'])
5252
->getMock();
53-
$logger->expects($this->once())->method('countErrors')->will($this->returnValue($nb));
54-
$logger->expects($this->exactly(2))->method('getLogs')->will($this->returnValue($logs));
53+
$logger->expects($this->once())->method('countErrors')->willReturn($nb);
54+
$logger->expects($this->exactly(2))->method('getLogs')->willReturn($logs);
5555

5656
$c = new LoggerDataCollector($logger);
5757
$c->lateCollect();

‎Tests/DataCollector/TimeDataCollectorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function testCollect()
4444
$this->assertEquals(0, $c->getStartTime());
4545

4646
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
47-
$kernel->expects($this->once())->method('getStartTime')->will($this->returnValue(123456));
47+
$kernel->expects($this->once())->method('getStartTime')->willReturn(123456);
4848

4949
$c = new TimeDataCollector($kernel);
5050
$request = new Request();

‎Tests/Debug/TraceableEventDispatcherTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function testStopwatchCheckControllerOnRequestEvent()
4949
->getMock();
5050
$stopwatch->expects($this->once())
5151
->method('isStarted')
52-
->will($this->returnValue(false));
52+
->willReturn(false);
5353

5454
$dispatcher = new TraceableEventDispatcher(new EventDispatcher(), $stopwatch);
5555

@@ -65,7 +65,7 @@ public function testStopwatchStopControllerOnRequestEvent()
6565
->getMock();
6666
$stopwatch->expects($this->once())
6767
->method('isStarted')
68-
->will($this->returnValue(true));
68+
->willReturn(true);
6969
$stopwatch->expects($this->once())
7070
->method('stop');
7171
$stopwatch->expects($this->once())
@@ -112,9 +112,9 @@ public function testListenerCanRemoveItselfWhenExecuted()
112112
protected function getHttpKernel($dispatcher, $controller)
113113
{
114114
$controllerResolver = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface')->getMock();
115-
$controllerResolver->expects($this->once())->method('getController')->will($this->returnValue($controller));
115+
$controllerResolver->expects($this->once())->method('getController')->willReturn($controller);
116116
$argumentResolver = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface')->getMock();
117-
$argumentResolver->expects($this->once())->method('getArguments')->will($this->returnValue([]));
117+
$argumentResolver->expects($this->once())->method('getArguments')->willReturn([]);
118118

119119
return new HttpKernel($dispatcher, $controllerResolver, new RequestStack(), $argumentResolver);
120120
}

‎Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ class LazyLoadingFragmentHandlerTest extends TestCase
2525
public function testRenderWithLegacyMapping()
2626
{
2727
$renderer = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface')->getMock();
28-
$renderer->expects($this->once())->method('getName')->will($this->returnValue('foo'));
29-
$renderer->expects($this->any())->method('render')->will($this->returnValue(new Response()));
28+
$renderer->expects($this->once())->method('getName')->willReturn('foo');
29+
$renderer->expects($this->any())->method('render')->willReturn(new Response());
3030

3131
$requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
32-
$requestStack->expects($this->any())->method('getCurrentRequest')->will($this->returnValue(Request::create('/')));
32+
$requestStack->expects($this->any())->method('getCurrentRequest')->willReturn(Request::create('/'));
3333

3434
$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
35-
$container->expects($this->once())->method('get')->will($this->returnValue($renderer));
35+
$container->expects($this->once())->method('get')->willReturn($renderer);
3636

3737
$handler = new LazyLoadingFragmentHandler($container, $requestStack, false);
3838
$handler->addRendererService('foo', 'foo');
@@ -46,15 +46,15 @@ public function testRenderWithLegacyMapping()
4646
public function testRender()
4747
{
4848
$renderer = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface')->getMock();
49-
$renderer->expects($this->once())->method('getName')->will($this->returnValue('foo'));
50-
$renderer->expects($this->any())->method('render')->will($this->returnValue(new Response()));
49+
$renderer->expects($this->once())->method('getName')->willReturn('foo');
50+
$renderer->expects($this->any())->method('render')->willReturn(new Response());
5151

5252
$requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
53-
$requestStack->expects($this->any())->method('getCurrentRequest')->will($this->returnValue(Request::create('/')));
53+
$requestStack->expects($this->any())->method('getCurrentRequest')->willReturn(Request::create('/'));
5454

5555
$container = $this->getMockBuilder('Psr\Container\ContainerInterface')->getMock();
5656
$container->expects($this->once())->method('has')->with('foo')->willReturn(true);
57-
$container->expects($this->once())->method('get')->will($this->returnValue($renderer));
57+
$container->expects($this->once())->method('get')->willReturn($renderer);
5858

5959
$handler = new LazyLoadingFragmentHandler($container, $requestStack, false);
6060

‎Tests/EventListener/AddRequestFormatsListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected function getGetResponseEventMock(Request $request)
7777

7878
$event->expects($this->any())
7979
->method('getRequest')
80-
->will($this->returnValue($request));
80+
->willReturn($request);
8181

8282
return $event;
8383
}

0 commit comments

Comments
 (0)