Merge branch '4.4' into 5.1

* 4.4:
  Use createMock() and use import instead of FQCN

Author: nicolas-grekas

Tests/CacheClearer/ChainCacheClearerTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\Tests\CacheClearer;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface;
 use Symfony\Component\HttpKernel\CacheClearer\ChainCacheClearer;
 
 class ChainCacheClearerTest extends TestCase
@@ -41,6 +42,6 @@ public function testInjectClearersInConstructor()
 
     protected function getMockClearer()
     {
-        return $this->getMockBuilder(\Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface::class)->getMock();
+        return $this->createMock(CacheClearerInterface::class);
     }
 }

Tests/CacheClearer/Psr6CacheClearerTest.php

@@ -19,7 +19,7 @@ class Psr6CacheClearerTest extends TestCase
 {
     public function testClearPoolsInjectedInConstructor()
     {
-        $pool = $this->getMockBuilder(CacheItemPoolInterface::class)->getMock();
+        $pool = $this->createMock(CacheItemPoolInterface::class);
         $pool
             ->expects($this->once())
             ->method('clear');
@@ -29,7 +29,7 @@ public function testClearPoolsInjectedInConstructor()
 
     public function testClearPool()
     {
-        $pool = $this->getMockBuilder(CacheItemPoolInterface::class)->getMock();
+        $pool = $this->createMock(CacheItemPoolInterface::class);
         $pool
             ->expects($this->once())
             ->method('clear');

Tests/CacheWarmer/CacheWarmerAggregateTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerAggregate;
+use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 
 class CacheWarmerAggregateTest extends TestCase
 {
@@ -30,7 +31,7 @@ public static function tearDownAfterClass(): void
 
     public function testInjectWarmersUsingConstructor()
     {
-        $warmer = $this->getCacheWarmerMock();
+        $warmer = $this->createMock(CacheWarmerInterface::class);
         $warmer
             ->expects($this->once())
             ->method('warmUp');
@@ -40,7 +41,7 @@ public function testInjectWarmersUsingConstructor()
 
     public function testWarmupDoesCallWarmupOnOptionalWarmersWhenEnableOptionalWarmersIsEnabled()
     {
-        $warmer = $this->getCacheWarmerMock();
+        $warmer = $this->createMock(CacheWarmerInterface::class);
         $warmer
             ->expects($this->never())
             ->method('isOptional');
@@ -55,7 +56,7 @@ public function testWarmupDoesCallWarmupOnOptionalWarmersWhenEnableOptionalWarme
 
     public function testWarmupDoesNotCallWarmupOnOptionalWarmersWhenEnableOptionalWarmersIsNotEnabled()
     {
-        $warmer = $this->getCacheWarmerMock();
+        $warmer = $this->createMock(CacheWarmerInterface::class);
         $warmer
             ->expects($this->once())
             ->method('isOptional')
@@ -67,13 +68,4 @@ public function testWarmupDoesNotCallWarmupOnOptionalWarmersWhenEnableOptionalWa
         $aggregate = new CacheWarmerAggregate([$warmer]);
         $aggregate->warmUp(self::$cacheDir);
     }
-
-    protected function getCacheWarmerMock()
-    {
-        $warmer = $this->getMockBuilder(\Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        return $warmer;
-    }
 }

Tests/Config/FileLocatorTest.php

@@ -13,12 +13,13 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\Config\FileLocator;
+use Symfony\Component\HttpKernel\KernelInterface;
 
 class FileLocatorTest extends TestCase
 {
     public function testLocate()
     {
-        $kernel = $this->getMockBuilder(\Symfony\Component\HttpKernel\KernelInterface::class)->getMock();
+        $kernel = $this->createMock(KernelInterface::class);
         $kernel
             ->expects($this->atLeastOnce())
             ->method('locateResource')

Tests/Controller/ArgumentResolver/NotTaggedControllerValueResolverTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\Tests\Controller\ArgumentResolver;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\NotTaggedControllerValueResolver;
@@ -55,7 +56,7 @@ public function testDoNotSupportEmptyController()
 
     public function testController()
     {
-        $this->expectException(\Symfony\Component\DependencyInjection\Exception\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Could not resolve argument $dummy of "App\Controller\Mine::method()", maybe you forgot to register the controller as a service or missed tagging it with the "controller.service_arguments"?');
         $resolver = new NotTaggedControllerValueResolver(new ServiceLocator([]));
         $argument = new ArgumentMetadata('dummy', \stdClass::class, false, false, null);
@@ -66,7 +67,7 @@ public function testController()
 
     public function testControllerWithATrailingBackSlash()
     {
-        $this->expectException(\Symfony\Component\DependencyInjection\Exception\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Could not resolve argument $dummy of "App\Controller\Mine::method()", maybe you forgot to register the controller as a service or missed tagging it with the "controller.service_arguments"?');
         $resolver = new NotTaggedControllerValueResolver(new ServiceLocator([]));
         $argument = new ArgumentMetadata('dummy', \stdClass::class, false, false, null);
@@ -77,7 +78,7 @@ public function testControllerWithATrailingBackSlash()
 
     public function testControllerWithMethodNameStartUppercase()
     {
-        $this->expectException(\Symfony\Component\DependencyInjection\Exception\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Could not resolve argument $dummy of "App\Controller\Mine::method()", maybe you forgot to register the controller as a service or missed tagging it with the "controller.service_arguments"?');
         $resolver = new NotTaggedControllerValueResolver(new ServiceLocator([]));
         $argument = new ArgumentMetadata('dummy', \stdClass::class, false, false, null);
@@ -88,7 +89,7 @@ public function testControllerWithMethodNameStartUppercase()
 
     public function testControllerNameIsAnArray()
     {
-        $this->expectException(\Symfony\Component\DependencyInjection\Exception\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Could not resolve argument $dummy of "App\Controller\Mine::method()", maybe you forgot to register the controller as a service or missed tagging it with the "controller.service_arguments"?');
         $resolver = new NotTaggedControllerValueResolver(new ServiceLocator([]));
         $argument = new ArgumentMetadata('dummy', \stdClass::class, false, false, null);

Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\ServiceValueResolver;
@@ -107,7 +108,7 @@ public function testControllerNameIsAnArray()
 
     public function testErrorIsTruncated()
     {
-        $this->expectException(\Symfony\Component\DependencyInjection\Exception\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Cannot autowire argument $dummy of "Symfony\Component\HttpKernel\Tests\Controller\ArgumentResolver\DummyController::index()": it references class "Symfony\Component\HttpKernel\Tests\Controller\ArgumentResolver\DummyService" but no such service exists.');
         $container = new ContainerBuilder();
         $container->addCompilerPass(new RegisterControllerArgumentLocatorsPass());

Tests/Controller/ArgumentResolverTest.php

@@ -177,7 +177,7 @@ public function testGetArgumentWithoutArray()
     {
         $this->expectException(\InvalidArgumentException::class);
         $factory = new ArgumentMetadataFactory();
-        $valueResolver = $this->getMockBuilder(ArgumentValueResolverInterface::class)->getMock();
+        $valueResolver = $this->createMock(ArgumentValueResolverInterface::class);
         $resolver = new ArgumentResolver($factory, [$valueResolver]);
 
         $valueResolver->expects($this->any())->method('supports')->willReturn(true);
@@ -241,7 +241,7 @@ public function testGetSessionArgumentsWithExtendedSession()
 
     public function testGetSessionArgumentsWithInterface()
     {
-        $session = $this->getMockBuilder(SessionInterface::class)->getMock();
+        $session = $this->createMock(SessionInterface::class);
         $request = Request::create('/');
         $request->setSession($session);
         $controller = [$this, 'controllerWithSessionInterface'];
@@ -252,7 +252,7 @@ public function testGetSessionArgumentsWithInterface()
     public function testGetSessionMissMatchWithInterface()
     {
         $this->expectException(\RuntimeException::class);
-        $session = $this->getMockBuilder(SessionInterface::class)->getMock();
+        $session = $this->createMock(SessionInterface::class);
         $request = Request::create('/');
         $request->setSession($session);
         $controller = [$this, 'controllerWithExtendingSession'];

Tests/Controller/ContainerControllerResolverTest.php

@@ -160,7 +160,7 @@ public function testExceptionWhenUsingRemovedControllerServiceWithClassNameAsNam
     {
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('Controller "Symfony\Component\HttpKernel\Tests\Controller\ControllerTestService" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?');
-        $container = $this->getMockBuilder(Container::class)->getMock();
+        $container = $this->createMock(Container::class);
         $container->expects($this->once())
             ->method('has')
             ->with(ControllerTestService::class)
@@ -184,7 +184,7 @@ public function testExceptionWhenUsingRemovedControllerService()
     {
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('Controller "app.my_controller" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?');
-        $container = $this->getMockBuilder(Container::class)->getMock();
+        $container = $this->createMock(Container::class);
         $container->expects($this->once())
             ->method('has')
             ->with('app.my_controller')
@@ -239,7 +239,7 @@ protected function createControllerResolver(LoggerInterface $logger = null, Cont
 
     protected function createMockContainer()
     {
-        return $this->getMockBuilder(ContainerInterface::class)->getMock();
+        return $this->createMock(ContainerInterface::class);
     }
 }
 

Tests/Controller/ControllerResolverTest.php

@@ -20,7 +20,7 @@ class ControllerResolverTest extends TestCase
 {
     public function testGetControllerWithoutControllerParameter()
     {
-        $logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
+        $logger = $this->createMock(LoggerInterface::class);
         $logger->expects($this->once())->method('warning')->with('Unable to look for the controller as the "_controller" parameter is missing.');
         $resolver = $this->createControllerResolver($logger);
 

Tests/Controller/ErrorControllerTest.php

@@ -27,7 +27,7 @@ class ErrorControllerTest extends TestCase
      */
     public function testInvokeController(Request $request, \Exception $exception, int $statusCode, string $content)
     {
-        $kernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
+        $kernel = $this->createMock(HttpKernelInterface::class);
         $errorRenderer = new HtmlErrorRenderer();
         $controller = new ErrorController($kernel, null, $errorRenderer);
         $response = $controller($exception);
@@ -67,7 +67,7 @@ public function testPreviewController()
         $_controller = 'error_controller';
         $code = 404;
 
-        $kernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
+        $kernel = $this->createMock(HttpKernelInterface::class);
         $kernel
             ->expects($this->once())
             ->method('handle')