Merge branch '2.8' into 3.1

fabpot · fabpot · commit 39a08daa9c74 · 2016-12-19T16:53:49.000+01:00
* 2.8:
  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
diff --git a/Tests/Bundle/BundleTest.php b/Tests/Bundle/BundleTest.php
@@ -32,7 +32,7 @@ public function testGetContainerExtension()
     public function testRegisterCommands()
     {
         $cmd = new FooCommand();
-        $app = $this->getMock('Symfony\Component\Console\Application');
+        $app = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
         $app->expects($this->once())->method('add')->with($this->equalTo($cmd));
 
         $bundle = new ExtensionPresentBundle();
@@ -58,7 +58,7 @@ public function testHttpKernelRegisterCommandsIgnoresCommandsThatAreRegisteredAs
         $container = new ContainerBuilder();
         $container->register('console.command.Symfony_Component_HttpKernel_Tests_Fixtures_ExtensionPresentBundle_Command_FooCommand', 'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand');
 
-        $application = $this->getMock('Symfony\Component\Console\Application');
+        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
         // add() is never called when the found command classes are already registered as services
         $application->expects($this->never())->method('add');
 
diff --git a/Tests/CacheClearer/ChainCacheClearerTest.php b/Tests/CacheClearer/ChainCacheClearerTest.php
@@ -52,6 +52,6 @@ public function testInjectClearerUsingAdd()
 
     protected function getMockClearer()
     {
-        return $this->getMock('Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface');
+        return $this->getMockBuilder('Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface')->getMock();
     }
 }
diff --git a/Tests/Config/FileLocatorTest.php b/Tests/Config/FileLocatorTest.php
@@ -17,7 +17,7 @@ class FileLocatorTest extends \PHPUnit_Framework_TestCase
 {
     public function testLocate()
     {
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
         $kernel
             ->expects($this->atLeastOnce())
             ->method('locateResource')
@@ -35,7 +35,7 @@ public function testLocate()
 
     public function testLocateWithGlobalResourcePath()
     {
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
         $kernel
             ->expects($this->atLeastOnce())
             ->method('locateResource')
diff --git a/Tests/Controller/ControllerResolverTest.php b/Tests/Controller/ControllerResolverTest.php
@@ -21,7 +21,7 @@ class ControllerResolverTest extends \PHPUnit_Framework_TestCase
 {
     public function testGetControllerWithoutControllerParameter()
     {
-        $logger = $this->getMock('Psr\Log\LoggerInterface');
+        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
         $logger->expects($this->once())->method('warning')->with('Unable to look for the controller as the "_controller" parameter is missing.');
         $resolver = $this->createControllerResolver($logger);
 
@@ -219,7 +219,7 @@ public function testGetVariadicArguments()
 
     public function testCreateControllerCanReturnAnyCallable()
     {
-        $mock = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolver', array('createController'));
+        $mock = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ControllerResolver')->setMethods(array('createController'))->getMock();
         $mock->expects($this->once())->method('createController')->will($this->returnValue('Symfony\Component\HttpKernel\Tests\Controller\some_controller_function'));
 
         $request = Request::create('/');
diff --git a/Tests/DataCollector/LoggerDataCollectorTest.php b/Tests/DataCollector/LoggerDataCollectorTest.php
@@ -20,7 +20,7 @@ class LoggerDataCollectorTest extends \PHPUnit_Framework_TestCase
      */
     public function testCollect($nb, $logs, $expectedLogs, $expectedDeprecationCount, $expectedScreamCount, $expectedPriorities = null)
     {
-        $logger = $this->getMock('Symfony\Component\HttpKernel\Log\DebugLoggerInterface');
+        $logger = $this->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')->getMock();
         $logger->expects($this->once())->method('countErrors')->will($this->returnValue($nb));
         $logger->expects($this->exactly(2))->method('getLogs')->will($this->returnValue($logs));
 
diff --git a/Tests/DataCollector/TimeDataCollectorTest.php b/Tests/DataCollector/TimeDataCollectorTest.php
@@ -41,7 +41,7 @@ public function testCollect()
         $c->collect($request, new Response());
         $this->assertEquals(0, $c->getStartTime());
 
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
         $kernel->expects($this->once())->method('getStartTime')->will($this->returnValue(123456));
 
         $c = new TimeDataCollector($kernel);
diff --git a/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php b/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php
@@ -19,14 +19,14 @@ class LazyLoadingFragmentHandlerTest extends \PHPUnit_Framework_TestCase
 {
     public function test()
     {
-        $renderer = $this->getMock('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface');
+        $renderer = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface')->getMock();
         $renderer->expects($this->once())->method('getName')->will($this->returnValue('foo'));
         $renderer->expects($this->any())->method('render')->will($this->returnValue(new Response()));
 
-        $requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
+        $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
         $requestStack->expects($this->any())->method('getCurrentRequest')->will($this->returnValue(Request::create('/')));
 
-        $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
         $container->expects($this->once())->method('get')->will($this->returnValue($renderer));
 
         $handler = new LazyLoadingFragmentHandler($container, $requestStack, false);
diff --git a/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php b/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
@@ -17,18 +17,8 @@ class MergeExtensionConfigurationPassTest extends \PHPUnit_Framework_TestCase
 {
     public function testAutoloadMainExtension()
     {
-        $container = $this->getMock(
-            'Symfony\\Component\\DependencyInjection\\ContainerBuilder',
-            array(
-                'getExtensionConfig',
-                'loadFromExtension',
-                'getParameterBag',
-                'getDefinitions',
-                'getAliases',
-                'getExtensions',
-            )
-        );
-        $params = $this->getMock('Symfony\\Component\\DependencyInjection\\ParameterBag\\ParameterBag');
+        $container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerBuilder')->setMethods(array('getExtensionConfig', 'loadFromExtension', 'getParameterBag', 'getDefinitions', 'getAliases', 'getExtensions'))->getMock();
+        $params = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ParameterBag\\ParameterBag')->getMock();
 
         $container->expects($this->at(0))
             ->method('getExtensionConfig')
diff --git a/Tests/EventListener/AddRequestFormatsListenerTest.php b/Tests/EventListener/AddRequestFormatsListenerTest.php
@@ -64,7 +64,7 @@ public function testSetAdditionalFormats()
 
     protected function getRequestMock()
     {
-        return $this->getMock('Symfony\Component\HttpFoundation\Request');
+        return $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
     }
 
     protected function getGetResponseEventMock(Request $request)
diff --git a/Tests/EventListener/DebugHandlersListenerTest.php b/Tests/EventListener/DebugHandlersListenerTest.php
@@ -36,7 +36,7 @@ class DebugHandlersListenerTest extends \PHPUnit_Framework_TestCase
 {
     public function testConfigure()
     {
-        $logger = $this->getMock('Psr\Log\LoggerInterface');
+        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
         $userHandler = function () {};
         $listener = new DebugHandlersListener($userHandler, $logger);
         $xHandler = new ExceptionHandler();
@@ -70,7 +70,7 @@ public function testConfigureForHttpKernelWithNoTerminateWithException()
         $listener = new DebugHandlersListener(null);
         $eHandler = new ErrorHandler();
         $event = new KernelEvent(
-            $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'),
+            $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(),
             Request::create('/'),
             HttpKernelInterface::MASTER_REQUEST
         );
@@ -94,7 +94,7 @@ public function testConsoleEvent()
     {
         $dispatcher = new EventDispatcher();
         $listener = new DebugHandlersListener(null);
-        $app = $this->getMock('Symfony\Component\Console\Application');
+        $app = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
         $app->expects($this->once())->method('getHelperSet')->will($this->returnValue(new HelperSet()));
         $command = new Command(__FUNCTION__);
         $command->setApplication($app);
diff --git a/Tests/EventListener/ExceptionListenerTest.php b/Tests/EventListener/ExceptionListenerTest.php
@@ -105,9 +105,9 @@ public function provider()
 
     public function testSubRequestFormat()
     {
-        $listener = new ExceptionListener('foo', $this->getMock('Psr\Log\LoggerInterface'));
+        $listener = new ExceptionListener('foo', $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock());
 
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $kernel->expects($this->once())->method('handle')->will($this->returnCallback(function (Request $request) {
             return new Response($request->getRequestFormat());
         }));
diff --git a/Tests/EventListener/FragmentListenerTest.php b/Tests/EventListener/FragmentListenerTest.php
@@ -116,6 +116,6 @@ public function testRemovesPathWithControllerNotDefined()
 
     private function createGetResponseEvent(Request $request, $requestType = HttpKernelInterface::MASTER_REQUEST)
     {
-        return new GetResponseEvent($this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, $requestType);
+        return new GetResponseEvent($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $request, $requestType);
     }
 }
diff --git a/Tests/EventListener/LocaleListenerTest.php b/Tests/EventListener/LocaleListenerTest.php
@@ -22,7 +22,7 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack', array(), array(), '', false);
+        $this->requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->disableOriginalConstructor()->getMock();
     }
 
     public function testDefaultLocaleWithoutSession()
@@ -51,10 +51,10 @@ public function testLocaleFromRequestAttribute()
     public function testLocaleSetForRoutingContext()
     {
         // the request context is updated
-        $context = $this->getMock('Symfony\Component\Routing\RequestContext');
+        $context = $this->getMockBuilder('Symfony\Component\Routing\RequestContext')->getMock();
         $context->expects($this->once())->method('setParameter')->with('_locale', 'es');
 
-        $router = $this->getMock('Symfony\Component\Routing\Router', array('getContext'), array(), '', false);
+        $router = $this->getMockBuilder('Symfony\Component\Routing\Router')->setMethods(array('getContext'))->disableOriginalConstructor()->getMock();
         $router->expects($this->once())->method('getContext')->will($this->returnValue($context));
 
         $request = Request::create('/');
@@ -67,18 +67,18 @@ public function testLocaleSetForRoutingContext()
     public function testRouterResetWithParentRequestOnKernelFinishRequest()
     {
         // the request context is updated
-        $context = $this->getMock('Symfony\Component\Routing\RequestContext');
+        $context = $this->getMockBuilder('Symfony\Component\Routing\RequestContext')->getMock();
         $context->expects($this->once())->method('setParameter')->with('_locale', 'es');
 
-        $router = $this->getMock('Symfony\Component\Routing\Router', array('getContext'), array(), '', false);
+        $router = $this->getMockBuilder('Symfony\Component\Routing\Router')->setMethods(array('getContext'))->disableOriginalConstructor()->getMock();
         $router->expects($this->once())->method('getContext')->will($this->returnValue($context));
 
         $parentRequest = Request::create('/');
         $parentRequest->setLocale('es');
 
         $this->requestStack->expects($this->once())->method('getParentRequest')->will($this->returnValue($parentRequest));
 
-        $event = $this->getMock('Symfony\Component\HttpKernel\Event\FinishRequestEvent', array(), array(), '', false);
+        $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\FinishRequestEvent')->disableOriginalConstructor()->getMock();
 
         $listener = new LocaleListener($this->requestStack, 'fr', $router);
         $listener->onKernelFinishRequest($event);
@@ -97,6 +97,6 @@ public function testRequestLocaleIsNotOverridden()
 
     private function getEvent(Request $request)
     {
-        return new GetResponseEvent($this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, HttpKernelInterface::MASTER_REQUEST);
+        return new GetResponseEvent($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $request, HttpKernelInterface::MASTER_REQUEST);
     }
 }
diff --git a/Tests/EventListener/ResponseListenerTest.php b/Tests/EventListener/ResponseListenerTest.php
@@ -31,7 +31,7 @@ protected function setUp()
         $listener = new ResponseListener('UTF-8');
         $this->dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'));
 
-        $this->kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+        $this->kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
     }
 
     protected function tearDown()
diff --git a/Tests/EventListener/RouterListenerTest.php b/Tests/EventListener/RouterListenerTest.php
@@ -23,7 +23,7 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack', array(), array(), '', false);
+        $this->requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->disableOriginalConstructor()->getMock();
     }
 
     /**
@@ -67,7 +67,7 @@ public function getPortData()
      */
     private function createGetResponseEventForUri($uri)
     {
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $request = Request::create($uri);
         $request->attributes->set('_controller', null); // Prevents going in to routing process
 
@@ -84,11 +84,11 @@ public function testInvalidMatcher()
 
     public function testRequestMatcher()
     {
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $request = Request::create('http://localhost/');
         $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
 
-        $requestMatcher = $this->getMock('Symfony\Component\Routing\Matcher\RequestMatcherInterface');
+        $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
         $requestMatcher->expects($this->once())
                        ->method('matchRequest')
                        ->with($this->isInstanceOf('Symfony\Component\HttpFoundation\Request'))
@@ -100,11 +100,11 @@ public function testRequestMatcher()
 
     public function testSubRequestWithDifferentMethod()
     {
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $request = Request::create('http://localhost/', 'post');
         $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
 
-        $requestMatcher = $this->getMock('Symfony\Component\Routing\Matcher\RequestMatcherInterface');
+        $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
         $requestMatcher->expects($this->any())
                        ->method('matchRequest')
                        ->with($this->isInstanceOf('Symfony\Component\HttpFoundation\Request'))
@@ -116,7 +116,7 @@ public function testSubRequestWithDifferentMethod()
         $listener->onKernelRequest($event);
 
         // sub-request with another HTTP method
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $request = Request::create('http://localhost/', 'get');
         $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::SUB_REQUEST);
 
@@ -130,17 +130,17 @@ public function testSubRequestWithDifferentMethod()
      */
     public function testLoggingParameter($parameter, $log, $parameters)
     {
-        $requestMatcher = $this->getMock('Symfony\Component\Routing\Matcher\RequestMatcherInterface');
+        $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
         $requestMatcher->expects($this->once())
           ->method('matchRequest')
           ->will($this->returnValue($parameter));
 
-        $logger = $this->getMock('Psr\Log\LoggerInterface');
+        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
         $logger->expects($this->once())
           ->method('info')
           ->with($this->equalTo($log), $this->equalTo($parameters));
 
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $request = Request::create('http://localhost/');
 
         $listener = new RouterListener($requestMatcher, $this->requestStack, new RequestContext(), $logger);
diff --git a/Tests/EventListener/SurrogateListenerTest.php b/Tests/EventListener/SurrogateListenerTest.php
@@ -25,7 +25,7 @@ class SurrogateListenerTest extends \PHPUnit_Framework_TestCase
     public function testFilterDoesNothingForSubRequests()
     {
         $dispatcher = new EventDispatcher();
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $response = new Response('foo <esi:include src="" />');
         $listener = new SurrogateListener(new Esi());
 
@@ -39,7 +39,7 @@ public function testFilterDoesNothingForSubRequests()
     public function testFilterWhenThereIsSomeEsiIncludes()
     {
         $dispatcher = new EventDispatcher();
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $response = new Response('foo <esi:include src="" />');
         $listener = new SurrogateListener(new Esi());
 
@@ -53,7 +53,7 @@ public function testFilterWhenThereIsSomeEsiIncludes()
     public function testFilterWhenThereIsNoEsiIncludes()
     {
         $dispatcher = new EventDispatcher();
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $response = new Response('foo');
         $listener = new SurrogateListener(new Esi());
 
diff --git a/Tests/EventListener/TestSessionListenerTest.php b/Tests/EventListener/TestSessionListenerTest.php
@@ -82,7 +82,7 @@ private function filterResponse(Request $request, $type = HttpKernelInterface::M
     {
         $request->setSession($this->session);
         $response = new Response();
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $event = new FilterResponseEvent($kernel, $request, $type, $response);
 
         $this->listener->onKernelResponse($event);
diff --git a/Tests/EventListener/TranslatorListenerTest.php b/Tests/EventListener/TranslatorListenerTest.php
diff --git a/Tests/EventListener/ValidateRequestListenerTest.php b/Tests/EventListener/ValidateRequestListenerTest.php
diff --git a/Tests/Fragment/FragmentHandlerTest.php b/Tests/Fragment/FragmentHandlerTest.php
diff --git a/Tests/Fragment/HIncludeFragmentRendererTest.php b/Tests/Fragment/HIncludeFragmentRendererTest.php
diff --git a/Tests/HttpCache/EsiTest.php b/Tests/HttpCache/EsiTest.php
diff --git a/Tests/HttpCache/SsiTest.php b/Tests/HttpCache/SsiTest.php
diff --git a/Tests/KernelTest.php b/Tests/KernelTest.php

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,6 @@ public function testInjectClearerUsingAdd()`
`52`	`52`
`53`	`53`	`protected function getMockClearer()`
`54`	`54`	`{`
`55`		`- return $this->getMock('Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface');`
	`55`	`+ return $this->getMockBuilder('Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface')->getMock();`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class FileLocatorTest extends \PHPUnit_Framework_TestCase`
`17`	`17`	`{`
`18`	`18`	`public function testLocate()`
`19`	`19`	`{`
`20`		`- $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');`
	`20`	`+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();`
`21`	`21`	`$kernel`
`22`	`22`	`->expects($this->atLeastOnce())`
`23`	`23`	`->method('locateResource')`
`@@ -35,7 +35,7 @@ public function testLocate()`
`35`	`35`
`36`	`36`	`public function testLocateWithGlobalResourcePath()`
`37`	`37`	`{`
`38`		`- $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');`
	`38`	`+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();`
`39`	`39`	`$kernel`
`40`	`40`	`->expects($this->atLeastOnce())`
`41`	`41`	`->method('locateResource')`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class ControllerResolverTest extends \PHPUnit_Framework_TestCase`
`21`	`21`	`{`
`22`	`22`	`public function testGetControllerWithoutControllerParameter()`
`23`	`23`	`{`
`24`		`- $logger = $this->getMock('Psr\Log\LoggerInterface');`
	`24`	`+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();`
`25`	`25`	`$logger->expects($this->once())->method('warning')->with('Unable to look for the controller as the "_controller" parameter is missing.');`
`26`	`26`	`$resolver = $this->createControllerResolver($logger);`
`27`	`27`
`@@ -219,7 +219,7 @@ public function testGetVariadicArguments()`
`219`	`219`
`220`	`220`	`public function testCreateControllerCanReturnAnyCallable()`
`221`	`221`	`{`
`222`		`- $mock = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolver', array('createController'));`
	`222`	`+ $mock = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ControllerResolver')->setMethods(array('createController'))->getMock();`
`223`	`223`	`$mock->expects($this->once())->method('createController')->will($this->returnValue('Symfony\Component\HttpKernel\Tests\Controller\some_controller_function'));`
`224`	`224`
`225`	`225`	`$request = Request::create('/');`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class LoggerDataCollectorTest extends \PHPUnit_Framework_TestCase`
`20`	`20`	`*/`
`21`	`21`	`public function testCollect($nb, $logs, $expectedLogs, $expectedDeprecationCount, $expectedScreamCount, $expectedPriorities = null)`
`22`	`22`	`{`
`23`		`- $logger = $this->getMock('Symfony\Component\HttpKernel\Log\DebugLoggerInterface');`
	`23`	`+ $logger = $this->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')->getMock();`
`24`	`24`	`$logger->expects($this->once())->method('countErrors')->will($this->returnValue($nb));`
`25`	`25`	`$logger->expects($this->exactly(2))->method('getLogs')->will($this->returnValue($logs));`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function testSetAdditionalFormats()`
`64`	`64`
`65`	`65`	`protected function getRequestMock()`
`66`	`66`	`{`
`67`		`- return $this->getMock('Symfony\Component\HttpFoundation\Request');`
	`67`	`+ return $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`protected function getGetResponseEventMock(Request $request)`