Merge branch '4.2' into 4.3

* 4.2:
  fixed CS
  fixed CS
  [HttpKernel] Remove TestEventDispatcher.

Author: fabpot

.php_cs.dist

@@ -15,7 +15,7 @@ return PhpCsFixer\Config::create()
         'ordered_imports' => true,
         'protected_to_private' => false,
         // Part of @Symfony:risky in PHP-CS-Fixer 2.13.0. To be removed from the config file once upgrading
-        'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced'],
+        'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced', 'strict' => true],
         // Part of future @Symfony ruleset in PHP-CS-Fixer To be removed from the config file once upgrading
         'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
     ])

src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php

@@ -61,7 +61,7 @@ public static function createTestConfiguration()
         $config = new Configuration();
         $config->setEntityNamespaces(['SymfonyTestsDoctrine' => 'Symfony\Bridge\Doctrine\Tests\Fixtures']);
         $config->setAutoGenerateProxyClasses(true);
-        $config->setProxyDir(\sys_get_temp_dir());
+        $config->setProxyDir(sys_get_temp_dir());
         $config->setProxyNamespace('SymfonyTests\Doctrine');
         $config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader()));
         $config->setQueryCacheImpl(new ArrayCache());

src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php

@@ -186,7 +186,7 @@ private function formatWithIdentifiers(ObjectManager $em, ClassMetadata $class,
             return $this->formatValue($value, self::PRETTY_DATE);
         }
 
-        if (\method_exists($value, '__toString')) {
+        if (method_exists($value, '__toString')) {
             return (string) $value;
         }
 

src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php

@@ -67,7 +67,7 @@ public function getLogs(/* Request $request = null */)
             @trigger_error(sprintf('The "%s()" method will have a new "Request $request = null" argument in version 5.0, not defining it is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
         }
 
-        if (1 <= \func_num_args() && null !== $request = \func_get_arg(0)) {
+        if (1 <= \func_num_args() && null !== $request = func_get_arg(0)) {
             return $this->records[spl_object_hash($request)] ?? [];
         }
 
@@ -89,7 +89,7 @@ public function countErrors(/* Request $request = null */)
             @trigger_error(sprintf('The "%s()" method will have a new "Request $request = null" argument in version 5.0, not defining it is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
         }
 
-        if (1 <= \func_num_args() && null !== $request = \func_get_arg(0)) {
+        if (1 <= \func_num_args() && null !== $request = func_get_arg(0)) {
             return $this->errorCount[spl_object_hash($request)] ?? 0;
         }
 

src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php

@@ -53,7 +53,7 @@ public function __construct(array $mockedNamespaces = array())
             Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
         }
 
-        $enableDebugClassLoader = \class_exists('Symfony\Component\Debug\DebugClassLoader');
+        $enableDebugClassLoader = class_exists('Symfony\Component\Debug\DebugClassLoader');
 
         foreach ($mockedNamespaces as $type => $namespaces) {
             if (!\is_array($namespaces)) {

src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php

@@ -99,7 +99,7 @@ public function getProxyCode(Definition $definition)
 
     private static function getProxyManagerVersion(): string
     {
-        if (!\class_exists(Version::class)) {
+        if (!class_exists(Version::class)) {
             return '0.0.1';
         }
 

src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php

@@ -295,7 +295,7 @@ public function testWithGlobals()
         $tester = $this->createCommandTester([], [], null, null, false, ['message' => $message]);
         $tester->execute([], ['decorated' => true]);
         $display = $tester->getDisplay();
-        $this->assertContains(\json_encode($message), $display);
+        $this->assertContains(json_encode($message), $display);
     }
 
     public function testWithGlobalsJson()
@@ -304,7 +304,7 @@ public function testWithGlobalsJson()
         $tester = $this->createCommandTester([], [], null, null, false, $globals);
         $tester->execute(['--format' => 'json'], ['decorated' => true]);
         $display = $tester->getDisplay();
-        $display = \json_decode($display, true);
+        $display = json_decode($display, true);
         $this->assertSame($globals, $display['globals']);
     }
 
@@ -313,10 +313,10 @@ public function testWithFilter()
         $tester = $this->createCommandTester();
         $tester->execute(['--format' => 'json'], ['decorated' => false]);
         $display = $tester->getDisplay();
-        $display1 = \json_decode($display, true);
+        $display1 = json_decode($display, true);
         $tester->execute(['--filter' => 'date', '--format' => 'json'], ['decorated' => false]);
         $display = $tester->getDisplay();
-        $display2 = \json_decode($display, true);
+        $display2 = json_decode($display, true);
         $this->assertNotSame($display1, $display2);
     }
 

src/Symfony/Bridge/Twig/UndefinedCallableHandler.php

@@ -85,7 +85,7 @@ public static function onUndefinedFunction($name)
 
     private static function onUndefined($name, $type, $component)
     {
-        if (\class_exists(FullStack::class) && isset(self::$fullStackEnable[$component])) {
+        if (class_exists(FullStack::class) && isset(self::$fullStackEnable[$component])) {
             throw new SyntaxError(sprintf('Did you forget to %s? Unknown %s "%s".', self::$fullStackEnable[$component], $type, $name));
         }
 

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php

@@ -40,7 +40,7 @@ public function __construct(Reader $annotationReader, string $phpArrayFile, $exc
         if ($excludeRegexp instanceof CacheItemPoolInterface) {
             @trigger_error(sprintf('The CacheItemPoolInterface $fallbackPool argument of "%s()" is deprecated since Symfony 4.2, you should not pass it anymore.', __METHOD__), E_USER_DEPRECATED);
             $excludeRegexp = $debug;
-            $debug = 4 < \func_num_args() && \func_get_arg(4);
+            $debug = 4 < \func_num_args() && func_get_arg(4);
         }
         parent::__construct($phpArrayFile);
         $this->annotationReader = $annotationReader;

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php

@@ -36,7 +36,7 @@ class SerializerCacheWarmer extends AbstractPhpFileCacheWarmer
      */
     public function __construct(array $loaders, string $phpArrayFile)
     {
-        if (2 < \func_num_args() && \func_get_arg(2) instanceof CacheItemPoolInterface) {
+        if (2 < \func_num_args() && func_get_arg(2) instanceof CacheItemPoolInterface) {
             @trigger_error(sprintf('The CacheItemPoolInterface $fallbackPool argument of "%s()" is deprecated since Symfony 4.2, you should not pass it anymore.', __METHOD__), E_USER_DEPRECATED);
         }
         parent::__construct($phpArrayFile);