Merge branch '3.4' into 4.2

* 3.4:
  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

@@ -58,7 +58,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/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/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php

@@ -681,7 +681,7 @@ private function doAdvisoryLock(string $sessionId)
         switch ($this->driver) {
             case 'mysql':
                 // MySQL 5.7.5 and later enforces a maximum length on lock names of 64 characters. Previously, no limit was enforced.
-                $lockId = \substr($sessionId, 0, 64);
+                $lockId = substr($sessionId, 0, 64);
                 // should we handle the return value? 0 on timeout, null on error
                 // we use a timeout of 50 seconds which is also the default for innodb_lock_wait_timeout
                 $stmt = $this->pdo->prepare('SELECT GET_LOCK(:key, 50)');

src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php

@@ -47,7 +47,7 @@ public function collect(Request $request, Response $response, \Exception $except
             'token' => $response->headers->get('X-Debug-Token'),
             'start_time' => $startTime * 1000,
             'events' => [],
-            'stopwatch_installed' => \class_exists(Stopwatch::class, false),
+            'stopwatch_installed' => class_exists(Stopwatch::class, false),
         ];
     }
 

src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php

@@ -132,20 +132,20 @@ public function update(Response $response)
         $maxAge = null;
         $sMaxage = null;
 
-        if (\is_numeric($this->ageDirectives['max-age'])) {
+        if (is_numeric($this->ageDirectives['max-age'])) {
             $maxAge = $this->ageDirectives['max-age'] + $this->age;
             $response->headers->addCacheControlDirective('max-age', $maxAge);
         }
 
-        if (\is_numeric($this->ageDirectives['s-maxage'])) {
+        if (is_numeric($this->ageDirectives['s-maxage'])) {
             $sMaxage = $this->ageDirectives['s-maxage'] + $this->age;
 
             if ($maxAge !== $sMaxage) {
                 $response->headers->addCacheControlDirective('s-maxage', $sMaxage);
             }
         }
 
-        if (\is_numeric($this->ageDirectives['expires'])) {
+        if (is_numeric($this->ageDirectives['expires'])) {
             $date = clone $response->getDate();
             $date->modify('+'.($this->ageDirectives['expires'] + $this->age).' seconds');
             $response->setExpires($date);

src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php

@@ -52,6 +52,6 @@ public function testCollect()
 
         $c->collect($request, new Response());
         $this->assertEquals(123456000, $c->getStartTime());
-        $this->assertSame(\class_exists(Stopwatch::class, false), $c->isStopwatchInstalled());
+        $this->assertSame(class_exists(Stopwatch::class, false), $c->isStopwatchInstalled());
     }
 }

src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php

@@ -138,7 +138,7 @@ public function serialize()
     {
         $serialized = [$this->user, $this->authenticated, $this->roles, $this->attributes];
 
-        return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     /**