Merge branch '6.0' into 6.1

* 6.0:
  Fix CS
  Fix CS

Author: fabpot

Command/ConfigDebugCommand.php

@@ -98,7 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         if (null === $path = $input->getArgument('path')) {
             $io->title(
-                sprintf('Current configuration for %s', ($name === $extensionAlias ? sprintf('extension with alias "%s"', $extensionAlias) : sprintf('"%s"', $name)))
+                sprintf('Current configuration for %s', $name === $extensionAlias ? sprintf('extension with alias "%s"', $extensionAlias) : sprintf('"%s"', $name))
             );
 
             $io->writeln(Yaml::dump([$extensionAlias => $config], 10));

Console/Descriptor/TextDescriptor.php

@@ -93,11 +93,11 @@ protected function describeRoute(Route $route, array $options = [])
             ['Route Name', $options['name'] ?? ''],
             ['Path', $route->getPath()],
             ['Path Regex', $route->compile()->getRegex()],
-            ['Host', ('' !== $route->getHost() ? $route->getHost() : 'ANY')],
-            ['Host Regex', ('' !== $route->getHost() ? $route->compile()->getHostRegex() : '')],
-            ['Scheme', ($route->getSchemes() ? implode('|', $route->getSchemes()) : 'ANY')],
-            ['Method', ($route->getMethods() ? implode('|', $route->getMethods()) : 'ANY')],
-            ['Requirements', ($route->getRequirements() ? $this->formatRouterConfig($route->getRequirements()) : 'NO CUSTOM')],
+            ['Host', '' !== $route->getHost() ? $route->getHost() : 'ANY'],
+            ['Host Regex', '' !== $route->getHost() ? $route->compile()->getHostRegex() : ''],
+            ['Scheme', $route->getSchemes() ? implode('|', $route->getSchemes()) : 'ANY'],
+            ['Method', $route->getMethods() ? implode('|', $route->getMethods()) : 'ANY'],
+            ['Requirements', $route->getRequirements() ? $this->formatRouterConfig($route->getRequirements()) : 'NO CUSTOM'],
             ['Class', \get_class($route)],
             ['Defaults', $this->formatRouterConfig($defaults)],
             ['Options', $this->formatRouterConfig($route->getOptions())],

DependencyInjection/Configuration.php

@@ -1912,7 +1912,7 @@ private function addHttpClientRetrySection()
                     ->integerNode('max_delay')->defaultValue(0)->min(0)->info('Max time in ms that a retry should ever be delayed (0 = infinite)')->end()
                     ->floatNode('jitter')->defaultValue(0.1)->min(0)->max(1)->info('Randomness in percent (between 0 and 1) to apply to the delay')->end()
                 ->end()
-            ;
+        ;
     }
 
     private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)

DependencyInjection/FrameworkExtension.php

@@ -964,7 +964,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             if (isset($workflow['marking_store']['type'])) {
                 $markingStoreDefinition = new ChildDefinition('workflow.marking_store.method');
                 $markingStoreDefinition->setArguments([
-                    'state_machine' === $type, //single state
+                    'state_machine' === $type, // single state
                     $workflow['marking_store']['property'],
                 ]);
             } elseif (isset($workflow['marking_store']['service'])) {

Resources/config/cache_debug.php

@@ -35,5 +35,5 @@
                 ],
             ])
             ->tag('kernel.cache_warmer', ['priority' => 64])
-        ;
+    ;
 };

Resources/config/esi.php

@@ -21,5 +21,5 @@
         ->set('esi_listener', SurrogateListener::class)
             ->args([service('esi')->ignoreOnInvalid()])
             ->tag('kernel.event_subscriber')
-        ;
+    ;
 };

Resources/config/validator.php

@@ -102,5 +102,5 @@
                 service('property_info'),
             ])
             ->tag('validator.auto_mapper')
-        ;
+    ;
 };

Tests/Functional/ContainerDebugCommandTest.php

@@ -117,7 +117,7 @@ public function testDescribeEnvVars()
  * UNKNOWN
 
 TXT
-        , $tester->getDisplay(true));
+            , $tester->getDisplay(true));
 
         putenv('REAL');
     }

Tests/Translation/TranslatorTest.php

@@ -139,7 +139,7 @@ public function testInvalidOptions()
         $this->expectExceptionMessage('The Translator does not support the following options: \'foo\'');
         $container = $this->createMock(ContainerInterface::class);
 
-        (new Translator($container, new MessageFormatter(), 'en', [], ['foo' => 'bar']));
+        new Translator($container, new MessageFormatter(), 'en', [], ['foo' => 'bar']);
     }
 
     /** @dataProvider getDebugModeAndCacheDirCombinations */