Merge branch '4.1' into 4.2

* 4.1:
  fixed tests
  fixed CS
  fixed CS
  fixed CS
  fixed short array CS in comments
  fixed CS in ExpressionLanguage fixtures
  fixed CS in generated files
  fixed CS on generated container files
  fixed CS on Form PHP templates
  fixed CS on YAML fixtures
  fixed fixtures
  switched array() to []

Author: fabpot

CacheWarmer/AbstractPhpFileCacheWarmer.php

@@ -46,13 +46,13 @@ public function warmUp($cacheDir)
     {
         $arrayAdapter = new ArrayAdapter();
 
-        spl_autoload_register(array(PhpArrayAdapter::class, 'throwOnRequiredClass'));
+        spl_autoload_register([PhpArrayAdapter::class, 'throwOnRequiredClass']);
         try {
             if (!$this->doWarmUp($cacheDir, $arrayAdapter)) {
                 return;
             }
         } finally {
-            spl_autoload_unregister(array(PhpArrayAdapter::class, 'throwOnRequiredClass'));
+            spl_autoload_unregister([PhpArrayAdapter::class, 'throwOnRequiredClass']);
         }
 
         // the ArrayAdapter stores the values serialized

CacheWarmer/RouterCacheWarmer.php

@@ -67,8 +67,8 @@ public function isOptional()
      */
     public static function getSubscribedServices()
     {
-        return array(
+        return [
             'router' => RouterInterface::class,
-        );
+        ];
     }
 }

CacheWarmer/SerializerCacheWarmer.php

@@ -76,7 +76,7 @@ protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
      */
     private function extractSupportedLoaders(array $loaders)
     {
-        $supportedLoaders = array();
+        $supportedLoaders = [];
 
         foreach ($loaders as $loader) {
             if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {

CacheWarmer/TemplateFinder.php

@@ -52,7 +52,7 @@ public function findAllTemplates()
             return $this->templates;
         }
 
-        $templates = array();
+        $templates = [];
 
         foreach ($this->kernel->getBundles() as $bundle) {
             $templates = array_merge($templates, $this->findTemplatesInBundle($bundle));
@@ -72,7 +72,7 @@ public function findAllTemplates()
      */
     private function findTemplatesInFolder($dir)
     {
-        $templates = array();
+        $templates = [];
 
         if (is_dir($dir)) {
             $finder = new Finder();

CacheWarmer/TemplatePathsCacheWarmer.php

@@ -39,7 +39,7 @@ public function __construct(TemplateFinderInterface $finder, TemplateLocator $lo
     public function warmUp($cacheDir)
     {
         $filesystem = new Filesystem();
-        $templates = array();
+        $templates = [];
 
         foreach ($this->finder->findAllTemplates() as $template) {
             $templates[$template->getLogicalName()] = rtrim($filesystem->makePathRelative($this->locator->locate($template), $cacheDir), '/');

CacheWarmer/TranslationsCacheWarmer.php

@@ -60,8 +60,8 @@ public function isOptional()
      */
     public static function getSubscribedServices()
     {
-        return array(
+        return [
             'translator' => TranslatorInterface::class,
-        );
+        ];
     }
 }

CacheWarmer/ValidatorCacheWarmer.php

@@ -86,7 +86,7 @@ protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array
      */
     private function extractSupportedLoaders(array $loaders)
     {
-        $supportedLoaders = array();
+        $supportedLoaders = [];
 
         foreach ($loaders as $loader) {
             if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {

Client.php

@@ -34,7 +34,7 @@ class Client extends BaseClient
     /**
      * {@inheritdoc}
      */
-    public function __construct(KernelInterface $kernel, array $server = array(), History $history = null, CookieJar $cookieJar = null)
+    public function __construct(KernelInterface $kernel, array $server = [], History $history = null, CookieJar $cookieJar = null)
     {
         parent::__construct($kernel, $server, $history, $cookieJar);
     }

Command/AbstractConfigCommand.php

@@ -29,8 +29,8 @@ abstract class AbstractConfigCommand extends ContainerDebugCommand
     protected function listBundles($output)
     {
         $title = 'Available registered bundles with their extension alias if available';
-        $headers = array('Bundle name', 'Extension alias');
-        $rows = array();
+        $headers = ['Bundle name', 'Extension alias'];
+        $rows = [];
 
         $bundles = $this->getApplication()->getKernel()->getBundles();
         usort($bundles, function ($bundleA, $bundleB) {
@@ -39,7 +39,7 @@ protected function listBundles($output)
 
         foreach ($bundles as $bundle) {
             $extension = $bundle->getContainerExtension();
-            $rows[] = array($bundle->getName(), $extension ? $extension->getAlias() : '');
+            $rows[] = [$bundle->getName(), $extension ? $extension->getAlias() : ''];
         }
 
         if ($output instanceof StyleInterface) {

Command/AssetsInstallCommand.php

@@ -56,9 +56,9 @@ public function __construct(Filesystem $filesystem)
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('target', InputArgument::OPTIONAL, 'The target directory', null),
-            ))
+            ])
             ->addOption('symlink', null, InputOption::VALUE_NONE, 'Symlinks the assets instead of copying it')
             ->addOption('relative', null, InputOption::VALUE_NONE, 'Make relative symlinks')
             ->addOption('no-cleanup', null, InputOption::VALUE_NONE, 'Do not remove the assets of the bundles that no longer exist')
@@ -125,10 +125,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $io->newLine();
 
-        $rows = array();
+        $rows = [];
         $copyUsed = false;
         $exitCode = 0;
-        $validAssetDirs = array();
+        $validAssetDirs = [];
         /** @var BundleInterface $bundle */
         foreach ($kernel->getBundles() as $bundle) {
             if (!is_dir($originDir = $bundle->getPath().'/Resources/public')) {
@@ -161,13 +161,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 }
 
                 if ($method === $expectedMethod) {
-                    $rows[] = array(sprintf('<fg=green;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'OK' : "\xE2\x9C\x94" /* HEAVY CHECK MARK (U+2714) */), $message, $method);
+                    $rows[] = [sprintf('<fg=green;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'OK' : "\xE2\x9C\x94" /* HEAVY CHECK MARK (U+2714) */), $message, $method];
                 } else {
-                    $rows[] = array(sprintf('<fg=yellow;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'WARNING' : '!'), $message, $method);
+                    $rows[] = [sprintf('<fg=yellow;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'WARNING' : '!'), $message, $method];
                 }
             } catch (\Exception $e) {
                 $exitCode = 1;
-                $rows[] = array(sprintf('<fg=red;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'ERROR' : "\xE2\x9C\x98" /* HEAVY BALLOT X (U+2718) */), $message, $e->getMessage());
+                $rows[] = [sprintf('<fg=red;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'ERROR' : "\xE2\x9C\x98" /* HEAVY BALLOT X (U+2718) */), $message, $e->getMessage()];
             }
         }
         // remove the assets of the bundles that no longer exist
@@ -177,7 +177,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         if ($rows) {
-            $io->table(array('', 'Bundle', 'Method / Error'), $rows);
+            $io->table(['', 'Bundle', 'Method / Error'], $rows);
         }
 
         if (0 !== $exitCode) {