Merge branch '3.4' into 4.3

* 3.4:
  Fix CS

Author: nicolas-grekas

Compiler/CheckDefinitionValidityPass.php

@@ -49,21 +49,10 @@ public function process(ContainerBuilder $container)
                 }
                 if (class_exists($id) || interface_exists($id, false)) {
                     if (0 === strpos($id, '\\') && 1 < substr_count($id, '\\')) {
-                        throw new RuntimeException(sprintf(
-                            'The definition for "%s" has no class attribute, and appears to reference a class or interface. '
-                            .'Please specify the class attribute explicitly or remove the leading backslash by renaming '
-                            .'the service to "%s" to get rid of this error.',
-                            $id, substr($id, 1)
-                        ));
+                        throw new RuntimeException(sprintf('The definition for "%s" has no class attribute, and appears to reference a class or interface. Please specify the class attribute explicitly or remove the leading backslash by renaming the service to "%s" to get rid of this error.', $id, substr($id, 1)));
                     }
 
-                    throw new RuntimeException(sprintf(
-                         'The definition for "%s" has no class attribute, and appears to reference a '
-                        .'class or interface in the global namespace. Leaving out the "class" attribute '
-                        .'is only allowed for namespaced classes. Please specify the class attribute '
-                        .'explicitly to get rid of this error.',
-                        $id
-                    ));
+                    throw new RuntimeException(sprintf('The definition for "%s" has no class attribute, and appears to reference a class or interface in the global namespace. Leaving out the "class" attribute is only allowed for namespaced classes. Please specify the class attribute explicitly to get rid of this error.', $id));
                 }
 
                 throw new RuntimeException(sprintf('The definition for "%s" has no class. If you intend to inject this service dynamically at runtime, please mark it as synthetic=true. If this is an abstract definition solely used by child definitions, please add abstract=true, otherwise specify a class to get rid of this error.', $id));

Loader/Configurator/ContainerConfigurator.php

@@ -48,13 +48,7 @@ final public function extension(string $namespace, array $config)
     {
         if (!$this->container->hasExtension($namespace)) {
             $extensions = array_filter(array_map(function (ExtensionInterface $ext) { return $ext->getAlias(); }, $this->container->getExtensions()));
-            throw new InvalidArgumentException(sprintf(
-                'There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s',
-                $namespace,
-                $this->file,
-                $namespace,
-                $extensions ? sprintf('"%s"', implode('", "', $extensions)) : 'none'
-            ));
+            throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s', $namespace, $this->file, $namespace, $extensions ? sprintf('"%s"', implode('", "', $extensions)) : 'none'));
         }
 
         $this->container->loadFromExtension($namespace, static::processValue($config));