Merge branch '3.4' into 4.4

* 3.4:
  Fix CS

Author: fabpot

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -1620,7 +1620,7 @@ protected function createContainer(array $data = [])
 
     protected function createContainerFromFile($file, $data = [], $resetCompilerPasses = true, $compile = true)
     {
-        $cacheKey = md5(\get_class($this).$file.serialize($data));
+        $cacheKey = md5(static::class.$file.serialize($data));
         if ($compile && isset(self::$containerCache[$cacheKey])) {
             return self::$containerCache[$cacheKey];
         }

Tests/Functional/AbstractWebTestCase.php

@@ -69,6 +69,6 @@ protected static function createKernel(array $options = []): KernelInterface
 
     protected static function getVarDir()
     {
-        return 'FB'.substr(strrchr(\get_called_class(), '\\'), 1);
+        return 'FB'.substr(strrchr(static::class, '\\'), 1);
     }
 }