Skip to content

Commit 753aa80

Browse files
fabpotfabpot
committed
Merge branch '3.1' into 3.2
* 3.1: fixed obsolete getMock() usage fixed obsolete getMock() usage fixed obsolete getMock() usage [WebProfilerBundle] Display multiple HTTP headers in WDT do not remove the Twig ExceptionController service removed obsolete condition do not try to register incomplete definitions
2 parents c9440eb + cd3712f commit 753aa80

31 files changed

+77
-93
lines changed

‎Tests/Bundle/BundleTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testGetContainerExtension()
3232
public function testRegisterCommands()
3333
{
3434
$cmd = new FooCommand();
35-
$app = $this->getMock('Symfony\Component\Console\Application');
35+
$app = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
3636
$app->expects($this->once())->method('add')->with($this->equalTo($cmd));
3737

3838
$bundle = new ExtensionPresentBundle();
@@ -58,7 +58,7 @@ public function testHttpKernelRegisterCommandsIgnoresCommandsThatAreRegisteredAs
5858
$container = new ContainerBuilder();
5959
$container->register('console.command.Symfony_Component_HttpKernel_Tests_Fixtures_ExtensionPresentBundle_Command_FooCommand', 'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand');
6060

61-
$application = $this->getMock('Symfony\Component\Console\Application');
61+
$application = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
6262
// add() is never called when the found command classes are already registered as services
6363
$application->expects($this->never())->method('add');
6464

‎Tests/CacheClearer/ChainCacheClearerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ public function testInjectClearerUsingAdd()
5252

5353
protected function getMockClearer()
5454
{
55-
return $this->getMock('Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface');
55+
return $this->getMockBuilder('Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface')->getMock();
5656
}
5757
}

‎Tests/Config/FileLocatorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class FileLocatorTest extends \PHPUnit_Framework_TestCase
1717
{
1818
public function testLocate()
1919
{
20-
$kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
20+
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
2121
$kernel
2222
->expects($this->atLeastOnce())
2323
->method('locateResource')
@@ -35,7 +35,7 @@ public function testLocate()
3535

3636
public function testLocateWithGlobalResourcePath()
3737
{
38-
$kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
38+
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
3939
$kernel
4040
->expects($this->atLeastOnce())
4141
->method('locateResource')

‎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/Controller/ControllerResolverTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class ControllerResolverTest extends \PHPUnit_Framework_TestCase
2121
{
2222
public function testGetControllerWithoutControllerParameter()
2323
{
24-
$logger = $this->getMock('Psr\Log\LoggerInterface');
24+
$logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
2525
$logger->expects($this->once())->method('warning')->with('Unable to look for the controller as the "_controller" parameter is missing.');
2626
$resolver = $this->createControllerResolver($logger);
2727

@@ -219,7 +219,7 @@ public function testGetVariadicArguments()
219219

220220
public function testCreateControllerCanReturnAnyCallable()
221221
{
222-
$mock = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolver', array('createController'));
222+
$mock = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ControllerResolver')->setMethods(array('createController'))->getMock();
223223
$mock->expects($this->once())->method('createController')->will($this->returnValue('Symfony\Component\HttpKernel\Tests\Controller\some_controller_function'));
224224

225225
$request = Request::create('/');

‎Tests/DataCollector/LoggerDataCollectorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class LoggerDataCollectorTest extends \PHPUnit_Framework_TestCase
2424
*/
2525
public function testCollect($nb, $logs, $expectedLogs, $expectedDeprecationCount, $expectedScreamCount, $expectedPriorities = null)
2626
{
27-
$logger = $this->getMock('Symfony\Component\HttpKernel\Log\DebugLoggerInterface');
27+
$logger = $this->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')->getMock();
2828
$logger->expects($this->once())->method('countErrors')->will($this->returnValue($nb));
2929
$logger->expects($this->exactly(2))->method('getLogs')->will($this->returnValue($logs));
3030

‎Tests/DataCollector/RequestDataCollectorTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function testCollectWithoutRouteParams()
7171

7272
public function testKernelResponseDoesNotStartSession()
7373
{
74-
$kernel = $this->getMock(HttpKernelInterface::class);
74+
$kernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
7575
$request = new Request();
7676
$session = new Session(new MockArraySessionStorage());
7777
$request->setSession($session);
@@ -247,8 +247,8 @@ protected function createResponse()
247247
*/
248248
protected function injectController($collector, $controller, $request)
249249
{
250-
$resolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface');
251-
$httpKernel = new HttpKernel(new EventDispatcher(), $resolver, null, $this->getMock(ArgumentResolverInterface::class));
250+
$resolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface')->getMock();
251+
$httpKernel = new HttpKernel(new EventDispatcher(), $resolver, null, $this->getMockBuilder(ArgumentResolverInterface::class)->getMock());
252252
$event = new FilterControllerEvent($httpKernel, $controller, $request, HttpKernelInterface::MASTER_REQUEST);
253253
$collector->onKernelController($event);
254254
}

‎Tests/DataCollector/TimeDataCollectorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function testCollect()
4141
$c->collect($request, new Response());
4242
$this->assertEquals(0, $c->getStartTime());
4343

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

4747
$c = new TimeDataCollector($kernel);

‎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));

0 commit comments

Comments
 (0)