Merge branch '5.4' into 6.0

* 5.4:
  Fix CS
  Fix CS

Author: fabpot

Loader/XmlFileLoader.php

@@ -188,7 +188,7 @@ protected function parseImport(RouteCollection $collection, \DOMElement $node, s
         $this->setCurrentDir(\dirname($path));
 
         /** @var RouteCollection[] $imported */
-        $imported = $this->import($resource, ('' !== $type ? $type : null), false, $file, $exclude) ?: [];
+        $imported = $this->import($resource, '' !== $type ? $type : null, false, $file, $exclude) ?: [];
 
         if (!\is_array($imported)) {
             $imported = [$imported];

Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php

@@ -91,7 +91,7 @@ public function testDumpWithRoutes()
 
     public function testDumpWithSimpleLocalizedRoutes()
     {
-        $this->routeCollection->add('test', (new Route('/foo')));
+        $this->routeCollection->add('test', new Route('/foo'));
         $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'en'));
         $this->routeCollection->add('test.nl', (new Route('/testen/is/leuk'))->setDefault('_locale', 'nl')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'nl'));
 

Tests/RouteTest.php

@@ -357,7 +357,7 @@ public function testLocaleRequirementWithLocalizedRoutes(Route $route)
     public function provideNonLocalizedRoutes()
     {
         return [
-            [(new Route('/foo'))],
+            [new Route('/foo')],
             [(new Route('/foo'))->setDefault('_locale', 'en')],
             [(new Route('/foo'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'foo')],
             [(new Route('/foo'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'foo')->setRequirement('_locale', 'foobar')],