Merge branch '4.4' into 5.0

* 4.4:
  Fix CS
  Fix CS

Author: fabpot

Kernel.php

@@ -218,7 +218,7 @@ public function getBundles()
     public function getBundle(string $name)
     {
         if (!isset($this->bundles[$name])) {
-            $class = \get_class($this);
+            $class = static::class;
             $class = 'c' === $class[0] && 0 === strpos($class, "class@anonymous\0") ? get_parent_class($class).'@anonymous' : $class;
 
             throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, $class));
@@ -393,7 +393,7 @@ protected function build(ContainerBuilder $container)
      */
     protected function getContainerClass()
     {
-        $class = \get_class($this);
+        $class = static::class;
         $class = 'c' === $class[0] && 0 === strpos($class, "class@anonymous\0") ? get_parent_class($class).str_replace('.', '_', ContainerBuilder::hash($class)) : $class;
         $class = str_replace('\\', '_', $class).ucfirst($this->environment).($this->debug ? 'Debug' : '').'Container';
         if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $class)) {
@@ -429,7 +429,7 @@ protected function initializeContainer()
         $cachePath = $cache->getPath();
 
         // Silence E_WARNING to ignore "include" failures - don't use "@" to prevent silencing fatal errors
-        $errorLevel = error_reporting(\E_ALL ^ \E_WARNING);
+        $errorLevel = error_reporting(E_ALL ^ E_WARNING);
 
         try {
             if (file_exists($cachePath) && \is_object($this->container = include $cachePath)

Log/Logger.php

@@ -101,6 +101,6 @@ private function format(string $level, string $message, array $context): string
             $message = strtr($message, $replacements);
         }
 
-        return sprintf('%s [%s] %s', date(\DateTime::RFC3339), $level, $message).\PHP_EOL;
+        return sprintf('%s [%s] %s', date(\DateTime::RFC3339), $level, $message).PHP_EOL;
     }
 }

Tests/DataCollector/RequestDataCollectorTest.php

@@ -99,7 +99,7 @@ public function provideControllerCallables()
                 '"Regular" callable',
                 [$this, 'testControllerInspection'],
                 [
-                    'class' => RequestDataCollectorTest::class,
+                    'class' => self::class,
                     'method' => 'testControllerInspection',
                     'file' => __FILE__,
                     'line' => $r1->getStartLine(),

Tests/Log/LoggerTest.php

@@ -186,7 +186,7 @@ public function testContextExceptionKeyCanBeExceptionOrOtherValues()
     public function testFormatter()
     {
         $this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile, function ($level, $message, $context) {
-            return json_encode(['level' => $level, 'message' => $message, 'context' => $context]).\PHP_EOL;
+            return json_encode(['level' => $level, 'message' => $message, 'context' => $context]).PHP_EOL;
         });
 
         $this->logger->error('An error', ['foo' => 'bar']);