Merge branch '5.2' into 5.x

fabpot · fabpot · commit 6a90e0e11303 · 2021-01-11T10:52:33.000+01:00
* 5.2:
  Use ::class keyword when possible
diff --git a/Command/AboutCommand.php b/Command/AboutCommand.php
@@ -89,7 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             new TableSeparator(),
             ['Version', \PHP_VERSION],
             ['Architecture', (\PHP_INT_SIZE * 8).' bits'],
-            ['Intl locale', class_exists('Locale', false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a'],
+            ['Intl locale', class_exists(\Locale::class, false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a'],
             ['Timezone', date_default_timezone_get().' (<comment>'.(new \DateTime())->format(\DateTime::W3C).'</>)'],
             ['OPcache', \extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'],
             ['APCu', \extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'],
diff --git a/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php b/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
@@ -125,7 +125,7 @@ public function testClassAutoloadExceptionWithUnrelatedException()
      */
     private function getReadOnlyReader(): object
     {
-        $readerMock = $this->getMockBuilder('Doctrine\Common\Annotations\Reader')->getMock();
+        $readerMock = $this->getMockBuilder(Reader::class)->getMock();
         $readerMock->expects($this->exactly(0))->method('getClassAnnotations');
         $readerMock->expects($this->exactly(0))->method('getClassAnnotation');
         $readerMock->expects($this->exactly(0))->method('getMethodAnnotations');
diff --git a/Tests/Command/CachePoolDeleteCommandTest.php b/Tests/Command/CachePoolDeleteCommandTest.php
@@ -89,7 +89,7 @@ public function testCommandDeleteFailed()
     private function getKernel(): object
     {
         $container = $this
-            ->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')
+            ->getMockBuilder(\Symfony\Component\DependencyInjection\ContainerInterface::class)
             ->getMock();
 
         $kernel = $this
diff --git a/Tests/Command/CachePruneCommandTest.php b/Tests/Command/CachePruneCommandTest.php
@@ -55,7 +55,7 @@ private function getEmptyRewindableGenerator(): RewindableGenerator
     private function getKernel(): object
     {
         $container = $this
-            ->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')
+            ->getMockBuilder(\Symfony\Component\DependencyInjection\ContainerInterface::class)
             ->getMock();
 
         $kernel = $this
diff --git a/Tests/Command/RouterMatchCommandTest.php b/Tests/Command/RouterMatchCommandTest.php
@@ -55,7 +55,7 @@ private function getRouter()
         $routeCollection = new RouteCollection();
         $routeCollection->add('foo', new Route('foo'));
         $requestContext = new RequestContext();
-        $router = $this->getMockBuilder('Symfony\Component\Routing\RouterInterface')->getMock();
+        $router = $this->getMockBuilder(\Symfony\Component\Routing\RouterInterface::class)->getMock();
         $router
             ->expects($this->any())
             ->method('getRouteCollection')
@@ -70,7 +70,7 @@ private function getRouter()
 
     private function getKernel()
     {
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+        $container = $this->getMockBuilder(\Symfony\Component\DependencyInjection\ContainerInterface::class)->getMock();
         $container
             ->expects($this->atLeastOnce())
             ->method('has')
diff --git a/Tests/Command/YamlLintCommandTest.php b/Tests/Command/YamlLintCommandTest.php
@@ -60,7 +60,7 @@ public function testLintIncorrectFile()
 
     public function testLintFileNotReadable()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(\RuntimeException::class);
         $tester = $this->createCommandTester();
         $filename = $this->createFile('');
         unlink($filename);
diff --git a/Tests/Controller/AbstractControllerTest.php b/Tests/Controller/AbstractControllerTest.php
@@ -82,7 +82,7 @@ public function testGetParameter()
 
     public function testMissingParameterBag()
     {
-        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+        $this->expectException(\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException::class);
         $this->expectExceptionMessage('TestAbstractController::getParameter()" method is missing a parameter bag');
         $container = new Container();
 
diff --git a/Tests/DependencyInjection/Compiler/ProfilerPassTest.php b/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
@@ -34,7 +34,7 @@ class ProfilerPassTest extends TestCase
      */
     public function testTemplateNoIdThrowsException()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $builder = new ContainerBuilder();
         $builder->register('profiler', 'ProfilerClass');
         $builder->register('my_collector_service')
diff --git a/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php b/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php
@@ -54,7 +54,7 @@ public function testNoExeptionIfAllDependenciesArePresent()
 
     public function testExceptionIfTheTokenStorageServiceIsNotPresent()
     {
-        $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');
+        $this->expectException(\Symfony\Component\DependencyInjection\Exception\LogicException::class);
         $this->expectExceptionMessage('The "security.token_storage" service is needed to be able to use the workflow guard listener.');
         $this->container->setParameter('workflow.has_guard_listeners', true);
         $this->container->register('security.authorization_checker', AuthorizationCheckerInterface::class);
@@ -66,7 +66,7 @@ public function testExceptionIfTheTokenStorageServiceIsNotPresent()
 
     public function testExceptionIfTheAuthorizationCheckerServiceIsNotPresent()
     {
-        $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');
+        $this->expectException(\Symfony\Component\DependencyInjection\Exception\LogicException::class);
         $this->expectExceptionMessage('The "security.authorization_checker" service is needed to be able to use the workflow guard listener.');
         $this->container->setParameter('workflow.has_guard_listeners', true);
         $this->container->register('security.token_storage', TokenStorageInterface::class);
@@ -78,7 +78,7 @@ public function testExceptionIfTheAuthorizationCheckerServiceIsNotPresent()
 
     public function testExceptionIfTheAuthenticationTrustResolverServiceIsNotPresent()
     {
-        $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');
+        $this->expectException(\Symfony\Component\DependencyInjection\Exception\LogicException::class);
         $this->expectExceptionMessage('The "security.authentication.trust_resolver" service is needed to be able to use the workflow guard listener.');
         $this->container->setParameter('workflow.has_guard_listeners', true);
         $this->container->register('security.token_storage', TokenStorageInterface::class);
@@ -90,7 +90,7 @@ public function testExceptionIfTheAuthenticationTrustResolverServiceIsNotPresent
 
     public function testExceptionIfTheRoleHierarchyServiceIsNotPresent()
     {
-        $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');
+        $this->expectException(\Symfony\Component\DependencyInjection\Exception\LogicException::class);
         $this->expectExceptionMessage('The "security.role_hierarchy" service is needed to be able to use the workflow guard listener.');
         $this->container->setParameter('workflow.has_guard_listeners', true);
         $this->container->register('security.token_storage', TokenStorageInterface::class);
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -48,7 +48,7 @@ public function getTestValidSessionName()
      */
     public function testInvalidSessionName($sessionName)
     {
-        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectException(InvalidConfigurationException::class);
         $processor = new Processor();
         $processor->processConfiguration(
             new Configuration(true),
diff --git a/Tests/Functional/CachePoolClearCommandTest.php b/Tests/Functional/CachePoolClearCommandTest.php
@@ -67,7 +67,7 @@ public function testCallClearer()
 
     public function testClearUnexistingPool()
     {
-        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+        $this->expectException(\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException::class);
         $this->expectExceptionMessage('You have requested a non-existent service "unknown_pool"');
         $this->createCommandTester()
             ->execute(['pools' => ['unknown_pool']], ['decorated' => false]);
diff --git a/Tests/Functional/RouterDebugCommandTest.php b/Tests/Functional/RouterDebugCommandTest.php
@@ -63,7 +63,7 @@ public function testSearchMultipleRoutes()
 
     public function testSearchWithThrow()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('The route "gerard" does not exist.');
         $tester = $this->createCommandTester();
         $tester->execute(['name' => 'gerard'], ['interactive' => true]);
diff --git a/Tests/Kernel/MicroKernelTraitTest.php b/Tests/Kernel/MicroKernelTraitTest.php
@@ -52,7 +52,7 @@ public function test()
 
         $this->assertEquals('halloween', $response->getContent());
         $this->assertEquals('Have a great day!', $kernel->getContainer()->getParameter('halloween'));
-        $this->assertInstanceOf('stdClass', $kernel->getContainer()->get('halloween'));
+        $this->assertInstanceOf(\stdClass::class, $kernel->getContainer()->get('halloween'));
     }
 
     public function testAsEventSubscriber()

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function testClassAutoloadExceptionWithUnrelatedException()`
`125`	`125`	`*/`
`126`	`126`	`private function getReadOnlyReader(): object`
`127`	`127`	`{`
`128`		`- $readerMock = $this->getMockBuilder('Doctrine\Common\Annotations\Reader')->getMock();`
	`128`	`+ $readerMock = $this->getMockBuilder(Reader::class)->getMock();`
`129`	`129`	`$readerMock->expects($this->exactly(0))->method('getClassAnnotations');`
`130`	`130`	`$readerMock->expects($this->exactly(0))->method('getClassAnnotation');`
`131`	`131`	`$readerMock->expects($this->exactly(0))->method('getMethodAnnotations');`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function testCommandDeleteFailed()`
`89`	`89`	`private function getKernel(): object`
`90`	`90`	`{`
`91`	`91`	`$container = $this`
`92`		`- ->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')`
	`92`	`+ ->getMockBuilder(\Symfony\Component\DependencyInjection\ContainerInterface::class)`
`93`	`93`	`->getMock();`
`94`	`94`
`95`	`95`	`$kernel = $this`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ private function getEmptyRewindableGenerator(): RewindableGenerator`
`55`	`55`	`private function getKernel(): object`
`56`	`56`	`{`
`57`	`57`	`$container = $this`
`58`		`- ->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')`
	`58`	`+ ->getMockBuilder(\Symfony\Component\DependencyInjection\ContainerInterface::class)`
`59`	`59`	`->getMock();`
`60`	`60`
`61`	`61`	`$kernel = $this`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function testLintIncorrectFile()`
`60`	`60`
`61`	`61`	`public function testLintFileNotReadable()`
`62`	`62`	`{`
`63`		`- $this->expectException('RuntimeException');`
	`63`	`+ $this->expectException(\RuntimeException::class);`
`64`	`64`	`$tester = $this->createCommandTester();`
`65`	`65`	`$filename = $this->createFile('');`
`66`	`66`	`unlink($filename);`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function testGetParameter()`
`82`	`82`
`83`	`83`	`public function testMissingParameterBag()`
`84`	`84`	`{`
`85`		`- $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');`
	`85`	`+ $this->expectException(\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException::class);`
`86`	`86`	`$this->expectExceptionMessage('TestAbstractController::getParameter()" method is missing a parameter bag');`
`87`	`87`	`$container = new Container();`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class ProfilerPassTest extends TestCase`
`34`	`34`	`*/`
`35`	`35`	`public function testTemplateNoIdThrowsException()`
`36`	`36`	`{`
`37`		`- $this->expectException('InvalidArgumentException');`
	`37`	`+ $this->expectException(\InvalidArgumentException::class);`
`38`	`38`	`$builder = new ContainerBuilder();`
`39`	`39`	`$builder->register('profiler', 'ProfilerClass');`
`40`	`40`	`$builder->register('my_collector_service')`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function getTestValidSessionName()`
`48`	`48`	`*/`
`49`	`49`	`public function testInvalidSessionName($sessionName)`
`50`	`50`	`{`
`51`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`51`	`+ $this->expectException(InvalidConfigurationException::class);`
`52`	`52`	`$processor = new Processor();`
`53`	`53`	`$processor->processConfiguration(`
`54`	`54`	`new Configuration(true),`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function testCallClearer()`
`67`	`67`
`68`	`68`	`public function testClearUnexistingPool()`
`69`	`69`	`{`
`70`		`- $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');`
	`70`	`+ $this->expectException(\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException::class);`
`71`	`71`	`$this->expectExceptionMessage('You have requested a non-existent service "unknown_pool"');`
`72`	`72`	`$this->createCommandTester()`
`73`	`73`	`->execute(['pools' => ['unknown_pool']], ['decorated' => false]);`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function testSearchMultipleRoutes()`
`63`	`63`
`64`	`64`	`public function testSearchWithThrow()`
`65`	`65`	`{`
`66`		`- $this->expectException('InvalidArgumentException');`
	`66`	`+ $this->expectException(\InvalidArgumentException::class);`
`67`	`67`	`$this->expectExceptionMessage('The route "gerard" does not exist.');`
`68`	`68`	`$tester = $this->createCommandTester();`
`69`	`69`	`$tester->execute(['name' => 'gerard'], ['interactive' => true]);`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function test()`
`52`	`52`
`53`	`53`	`$this->assertEquals('halloween', $response->getContent());`
`54`	`54`	`$this->assertEquals('Have a great day!', $kernel->getContainer()->getParameter('halloween'));`
`55`		`- $this->assertInstanceOf('stdClass', $kernel->getContainer()->get('halloween'));`
	`55`	`+ $this->assertInstanceOf(\stdClass::class, $kernel->getContainer()->get('halloween'));`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public function testAsEventSubscriber()`