Use ::class keyword when possible

Author: fabpot

Tests/Controller/ControllerNameParserTest.php

@@ -51,7 +51,7 @@ public function testParse()
             $parser->parse('foo:');
             $this->fail('->parse() throws an \InvalidArgumentException if the controller is not an a:b:c string');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('\InvalidArgumentException', $e, '->parse() throws an \InvalidArgumentException if the controller is not an a:b:c string');
+            $this->assertInstanceOf(\InvalidArgumentException::class, $e, '->parse() throws an \InvalidArgumentException if the controller is not an a:b:c string');
         }
     }
 
@@ -66,21 +66,21 @@ public function testBuild()
             $parser->build('TestBundle\FooBundle\Controller\DefaultController::index');
             $this->fail('->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('\InvalidArgumentException', $e, '->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
+            $this->assertInstanceOf(\InvalidArgumentException::class, $e, '->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
         }
 
         try {
             $parser->build('TestBundle\FooBundle\Controller\Default::indexAction');
             $this->fail('->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('\InvalidArgumentException', $e, '->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
+            $this->assertInstanceOf(\InvalidArgumentException::class, $e, '->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
         }
 
         try {
             $parser->build('Foo\Controller\DefaultController::indexAction');
             $this->fail('->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('\InvalidArgumentException', $e, '->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
+            $this->assertInstanceOf(\InvalidArgumentException::class, $e, '->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
         }
     }
 
@@ -95,7 +95,7 @@ public function testMissingControllers($name)
             $parser->parse($name);
             $this->fail('->parse() throws a \InvalidArgumentException if the class is found but does not exist');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('\InvalidArgumentException', $e, '->parse() throws a \InvalidArgumentException if the class is found but does not exist');
+            $this->assertInstanceOf(\InvalidArgumentException::class, $e, '->parse() throws a \InvalidArgumentException if the class is found but does not exist');
         }
     }
 
@@ -125,7 +125,7 @@ public function testInvalidBundleName($bundleName, $suggestedBundleName)
             $parser->parse($bundleName);
             $this->fail('->parse() throws a \InvalidArgumentException if the bundle does not exist');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('\InvalidArgumentException', $e, '->parse() throws a \InvalidArgumentException if the bundle does not exist');
+            $this->assertInstanceOf(\InvalidArgumentException::class, $e, '->parse() throws a \InvalidArgumentException if the bundle does not exist');
 
             if (false === $suggestedBundleName) {
                 // make sure we don't have a suggestion

Tests/Translation/TranslatorTest.php

@@ -140,7 +140,7 @@ public function testTransWithCachingWithInvalidLocale()
         $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('Invalid "invalid locale" locale.');
         $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
-        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir], 'loader', '\Symfony\Bundle\FrameworkBundle\Tests\Translation\TranslatorWithInvalidLocale');
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir], 'loader', TranslatorWithInvalidLocale::class);
 
         $translator->trans('foo');
     }
@@ -346,7 +346,7 @@ protected function getContainer($loader)
         return $container;
     }
 
-    public function getTranslator($loader, $options = [], $loaderFomat = 'loader', $translatorClass = '\Symfony\Bundle\FrameworkBundle\Translation\Translator', $defaultLocale = 'en')
+    public function getTranslator($loader, $options = [], $loaderFomat = 'loader', $translatorClass = Translator::class, $defaultLocale = 'en')
     {
         $translator = $this->createTranslator($loader, $options, $translatorClass, $loaderFomat, $defaultLocale);
 
@@ -403,7 +403,7 @@ public function testLoadingTranslationFilesWithDotsInMessageDomain()
         $this->assertEquals('It works!', $translator->trans('message', [], 'domain.with.dots'));
     }
 
-    private function createTranslator($loader, $options, $translatorClass = '\Symfony\Bundle\FrameworkBundle\Translation\Translator', $loaderFomat = 'loader', $defaultLocale = 'en')
+    private function createTranslator($loader, $options, $translatorClass = Translator::class, $loaderFomat = 'loader', $defaultLocale = 'en')
     {
         if (null === $defaultLocale) {
             return new $translatorClass(