Merge branch '3.4' into 4.1

* 3.4:
  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

DependencyInjection/DebugExtension.php

@@ -37,9 +37,9 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services.xml');
 
         $container->getDefinition('var_dumper.cloner')
-            ->addMethodCall('setMaxItems', array($config['max_items']))
-            ->addMethodCall('setMinDepth', array($config['min_depth']))
-            ->addMethodCall('setMaxString', array($config['max_string_length']));
+            ->addMethodCall('setMaxItems', [$config['max_items']])
+            ->addMethodCall('setMinDepth', [$config['min_depth']])
+            ->addMethodCall('setMaxString', [$config['max_string_length']]);
 
         if (null === $config['dump_destination']) {
             $container->getDefinition('var_dumper.command.server_dump')

Tests/DependencyInjection/Compiler/DumpDataCollectorPassTest.php

@@ -25,7 +25,7 @@ public function testProcessWithoutFileLinkFormatParameter()
         $container = new ContainerBuilder();
         $container->addCompilerPass(new DumpDataCollectorPass());
 
-        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', array(null, null, null, null));
+        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', [null, null, null, null]);
         $container->setDefinition('data_collector.dump', $definition);
 
         $container->compile();
@@ -39,7 +39,7 @@ public function testProcessWithToolbarEnabled()
         $container->addCompilerPass(new DumpDataCollectorPass());
         $requestStack = new RequestStack();
 
-        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', array(null, null, null, $requestStack));
+        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', [null, null, null, $requestStack]);
         $container->setDefinition('data_collector.dump', $definition);
         $container->setParameter('web_profiler.debug_toolbar.mode', WebDebugToolbarListener::ENABLED);
 
@@ -53,7 +53,7 @@ public function testProcessWithToolbarDisabled()
         $container = new ContainerBuilder();
         $container->addCompilerPass(new DumpDataCollectorPass());
 
-        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', array(null, null, null, new RequestStack()));
+        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', [null, null, null, new RequestStack()]);
         $container->setDefinition('data_collector.dump', $definition);
         $container->setParameter('web_profiler.debug_toolbar.mode', WebDebugToolbarListener::DISABLED);
 
@@ -67,7 +67,7 @@ public function testProcessWithoutToolbar()
         $container = new ContainerBuilder();
         $container->addCompilerPass(new DumpDataCollectorPass());
 
-        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', array(null, null, null, new RequestStack()));
+        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', [null, null, null, new RequestStack()]);
         $container->setDefinition('data_collector.dump', $definition);
 
         $container->compile();

Tests/DependencyInjection/DebugExtensionTest.php

@@ -22,36 +22,36 @@ public function testLoadWithoutConfiguration()
     {
         $container = $this->createContainer();
         $container->registerExtension(new DebugExtension());
-        $container->loadFromExtension('debug', array());
+        $container->loadFromExtension('debug', []);
         $this->compileContainer($container);
 
-        $expectedTags = array(
-            array(
+        $expectedTags = [
+            [
                 'id' => 'dump',
                 'template' => '@Debug/Profiler/dump.html.twig',
                 'priority' => 240,
-            ),
-        );
+            ],
+        ];
 
         $this->assertSame($expectedTags, $container->getDefinition('data_collector.dump')->getTag('data_collector'));
     }
 
     private function createContainer()
     {
-        $container = new ContainerBuilder(new ParameterBag(array(
+        $container = new ContainerBuilder(new ParameterBag([
             'kernel.cache_dir' => __DIR__,
             'kernel.charset' => 'UTF-8',
             'kernel.debug' => true,
-            'kernel.bundles' => array('DebugBundle' => 'Symfony\\Bundle\\DebugBundle\\DebugBundle'),
-        )));
+            'kernel.bundles' => ['DebugBundle' => 'Symfony\\Bundle\\DebugBundle\\DebugBundle'],
+        ]));
 
         return $container;
     }
 
     private function compileContainer(ContainerBuilder $container)
     {
-        $container->getCompilerPassConfig()->setOptimizationPasses(array());
-        $container->getCompilerPassConfig()->setRemovingPasses(array());
+        $container->getCompilerPassConfig()->setOptimizationPasses([]);
+        $container->getCompilerPassConfig()->setRemovingPasses([]);
         $container->compile();
     }
 }