Merge branch '4.1'

* 4.1:
  CS fix
  [Debug] fix compat with PHP 7.3

src/Symfony/Component/Console/Tests/Fixtures/Foo6Command.php

@@ -1,6 +1,5 @@
 <?php
 
-
 use Symfony\Component\Console\Command\Command;
 
 class Foo6Command extends Command

src/Symfony/Component/CssSelector/XPath/Translator.php

@@ -84,7 +84,7 @@ class Translator implements TranslatorInterface
             }
         }
 
-        return sprintf('concat(%s)', implode($parts, ', '));
+        return sprintf('concat(%s)', implode(', ', $parts));
     }
 
     /**

src/Symfony/Component/Debug/DebugClassLoader.php

@@ -341,7 +341,7 @@ class DebugClassLoader
                     self::$annotatedParameters[$class][$method->name][$parameterName] = sprintf('The "%%s::%s()" method will require a new "%s$%s" argument in the next major version of its parent class "%s", not defining it is deprecated.', $method->name, $parameterType ? $parameterType.' ' : '', $parameterName, $method->class);
                 }
             }
-       }
+        }
 
         return $deprecations;
     }

src/Symfony/Component/Debug/Tests/phpt/decorate_exception_hander.phpt

@@ -1,5 +1,7 @@
 --TEST--
 Test catching fatal errors when handlers are nested
+--INI--
+display_errors=0
 --FILE--
 <?php
 
@@ -24,7 +26,6 @@ if (true) {
 
 ?>
 --EXPECTF--
-Fatal error: Class 'Symfony\Component\Debug\missing' not found in %s on line %d
 object(Symfony\Component\Debug\Exception\ClassNotFoundException)#%d (8) {
   ["message":protected]=>
   string(131) "Attempted to load class "missing" from namespace "Symfony\Component\Debug".

src/Symfony/Component/Translation/Dumper/MoFileDumper.php

@@ -57,7 +57,7 @@ class MoFileDumper extends FileDumper
                           .$this->writeLong($offset[2] + $sourcesStart + $sourcesSize);
         }
 
-        $output = implode(array_map(array($this, 'writeLong'), $header))
+        $output = implode('', array_map(array($this, 'writeLong'), $header))
                .$sourceOffsets
                .$targetOffsets
                .$sources

src/Symfony/Component/Translation/IdentityTranslator.php

@@ -33,7 +33,7 @@ class IdentityTranslator implements TranslatorInterface
     {
         $this->selector = $selector;
 
-        if (\get_class($this) !== __CLASS__) {
+        if (__CLASS__ !== \get_class($this)) {
             @trigger_error(sprintf('Calling "%s()" is deprecated since Symfony 4.2.'), E_USER_DEPRECATED);
         }
     }

src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php

@@ -355,10 +355,10 @@ class RecursiveContextualValidator implements ContextualValidatorInterface
      * objects are iterated as well. Nested arrays are always iterated,
      * regardless of the value of $recursive.
      *
-     * @param iterable                  $collection    The collection
+     * @param iterable                  $collection   The collection
-     * @param string                    $propertyPath  The current property path
+     * @param string                    $propertyPath The current property path
-     * @param (string|GroupSequence)[]  $groups        The validated groups
+     * @param (string|GroupSequence)[]  $groups       The validated groups
-     * @param ExecutionContextInterface $context       The current execution context
+     * @param ExecutionContextInterface $context      The current execution context
      *
      * @see ClassNode
      * @see CollectionNode

src/Symfony/Component/VarDumper/Caster/LinkStub.php

@@ -55,9 +55,9 @@ class LinkStub extends ConstStub
         if ($composerRoot = $this->getComposerRoot($href, $this->inVendor)) {
             $this->attr['ellipsis'] = \strlen($href) - \strlen($composerRoot) + 1;
             $this->attr['ellipsis-type'] = 'path';
-            $this->attr['ellipsis-tail'] = 1 + ($this->inVendor ? 2 + \strlen(implode(\array_slice(explode(\DIRECTORY_SEPARATOR, substr($href, 1 - $this->attr['ellipsis'])), 0, 2))) : 0);
+            $this->attr['ellipsis-tail'] = 1 + ($this->inVendor ? 2 + \strlen(implode('', \array_slice(explode(\DIRECTORY_SEPARATOR, substr($href, 1 - $this->attr['ellipsis'])), 0, 2))) : 0);
         } elseif (3 < \count($ellipsis = explode(\DIRECTORY_SEPARATOR, $href))) {
-            $this->attr['ellipsis'] = 2 + \strlen(implode(\array_slice($ellipsis, -2)));
+            $this->attr['ellipsis'] = 2 + \strlen(implode('', \array_slice($ellipsis, -2)));
             $this->attr['ellipsis-type'] = 'path';
             $this->attr['ellipsis-tail'] = 1;
         }

src/Symfony/Component/Yaml/Inline.php

@@ -270,7 +270,7 @@ class Inline
             if (null !== $delimiters) {
                 $tmp = ltrim(substr($scalar, $i), ' ');
                 if ('' === $tmp) {
-                    throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode($delimiters)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+                    throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode('', $delimiters)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                 }
                 if (!\in_array($tmp[0], $delimiters)) {
                     throw new ParseException(sprintf('Unexpected characters (%s).', substr($scalar, $i)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);