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

Argument/BoundArgument.php

@@ -37,7 +37,7 @@ public function __construct($value, bool $trackUsage = true)
      */
     public function getValues()
     {
-        return array($this->value, $this->identifier, $this->used);
+        return [$this->value, $this->identifier, $this->used];
     }
 
     /**

Argument/ServiceClosureArgument.php

@@ -25,7 +25,7 @@ class ServiceClosureArgument implements ArgumentInterface
 
     public function __construct(Reference $reference)
     {
-        $this->values = array($reference);
+        $this->values = [$reference];
     }
 
     /**
@@ -41,7 +41,7 @@ public function getValues()
      */
     public function setValues(array $values)
     {
-        if (array(0) !== array_keys($values) || !($values[0] instanceof Reference || null === $values[0])) {
+        if ([0] !== array_keys($values) || !($values[0] instanceof Reference || null === $values[0])) {
             throw new InvalidArgumentException('A ServiceClosureArgument must hold one and only one Reference.');
         }
 

Argument/TaggedIteratorArgument.php

@@ -22,7 +22,7 @@ class TaggedIteratorArgument extends IteratorArgument
 
     public function __construct(string $tag)
     {
-        parent::__construct(array());
+        parent::__construct([]);
 
         $this->tag = $tag;
     }

Compiler/AutowirePass.php

@@ -117,7 +117,7 @@ private function doProcessValue($value, $isRoot = false)
         }
 
         if ($constructor) {
-            array_unshift($this->methodCalls, array($constructor, $value->getArguments()));
+            array_unshift($this->methodCalls, [$constructor, $value->getArguments()]);
         }
 
         $this->methodCalls = $this->autowireCalls($reflectionClass, $isRoot);
@@ -309,8 +309,8 @@ private function getAutowiredReference(TypedReference $reference)
      */
     private function populateAvailableTypes()
     {
-        $this->types = array();
-        $this->ambiguousServiceTypes = array();
+        $this->types = [];
+        $this->ambiguousServiceTypes = [];
 
         foreach ($this->container->getDefinitions() as $id => $definition) {
             $this->populateAvailableType($id, $definition);
@@ -361,7 +361,7 @@ private function set(string $type, string $id)
 
         // keep an array of all services matching this type
         if (!isset($this->ambiguousServiceTypes[$type])) {
-            $this->ambiguousServiceTypes[$type] = array($this->types[$type]);
+            $this->ambiguousServiceTypes[$type] = [$this->types[$type]];
             unset($this->types[$type]);
         }
         $this->ambiguousServiceTypes[$type][] = $id;
@@ -436,7 +436,7 @@ private function createTypeAlternatives(TypedReference $reference)
 
     private function getAliasesSuggestionForType($type, $extraContext = null)
     {
-        $aliases = array();
+        $aliases = [];
         foreach (class_parents($type) + class_implements($type) as $parent) {
             if ($this->container->has($parent) && !$this->container->findDefinition($parent)->isAbstract()) {
                 $aliases[] = $parent;

Compiler/AutowireRequiredMethodsPass.php

@@ -34,7 +34,7 @@ protected function processValue($value, $isRoot = false)
             return $value;
         }
 
-        $alreadyCalledMethods = array();
+        $alreadyCalledMethods = [];
 
         foreach ($value->getMethodCalls() as list($method)) {
             $alreadyCalledMethods[strtolower($method)] = true;

Compiler/CheckCircularReferencesPass.php

@@ -36,9 +36,9 @@ public function process(ContainerBuilder $container)
     {
         $graph = $container->getCompiler()->getServiceReferenceGraph();
 
-        $this->checkedNodes = array();
+        $this->checkedNodes = [];
         foreach ($graph->getNodes() as $id => $node) {
-            $this->currentPath = array($id);
+            $this->currentPath = [$id];
 
             $this->checkOutEdges($node->getOutEdges());
         }

Compiler/CheckDefinitionValidityPass.php

@@ -83,7 +83,7 @@ public function process(ContainerBuilder $container)
             if ($definition->isPublic() && !$definition->isPrivate()) {
                 $resolvedId = $container->resolveEnvPlaceholders($id, null, $usedEnvs);
                 if (null !== $usedEnvs) {
-                    throw new EnvParameterException(array($resolvedId), null, 'A service name ("%s") cannot contain dynamic values.');
+                    throw new EnvParameterException([$resolvedId], null, 'A service name ("%s") cannot contain dynamic values.');
                 }
             }
         }
@@ -92,7 +92,7 @@ public function process(ContainerBuilder $container)
             if ($alias->isPublic() && !$alias->isPrivate()) {
                 $resolvedId = $container->resolveEnvPlaceholders($id, null, $usedEnvs);
                 if (null !== $usedEnvs) {
-                    throw new EnvParameterException(array($resolvedId), null, 'An alias name ("%s") cannot contain dynamic values.');
+                    throw new EnvParameterException([$resolvedId], null, 'An alias name ("%s") cannot contain dynamic values.');
                 }
             }
         }

Compiler/Compiler.php

@@ -22,7 +22,7 @@
 class Compiler
 {
     private $passConfig;
-    private $log = array();
+    private $log = [];
     private $serviceReferenceGraph;
 
     public function __construct()
@@ -95,7 +95,7 @@ public function compile(ContainerBuilder $container)
                 $pass->process($container);
             }
         } catch (\Exception $e) {
-            $usedEnvs = array();
+            $usedEnvs = [];
             $prev = $e;
 
             do {

Compiler/DecoratorServicePass.php

@@ -32,9 +32,9 @@ public function process(ContainerBuilder $container)
             if (!$decorated = $definition->getDecoratedService()) {
                 continue;
             }
-            $definitions->insert(array($id, $definition), array($decorated[2], --$order));
+            $definitions->insert([$id, $definition], [$decorated[2], --$order]);
         }
-        $decoratingDefinitions = array();
+        $decoratingDefinitions = [];
 
         foreach ($definitions as list($id, $definition)) {
             list($inner, $renamedId) = $definition->getDecoratedService();
@@ -65,7 +65,7 @@ public function process(ContainerBuilder $container)
             if (isset($decoratingDefinitions[$inner])) {
                 $decoratingDefinition = $decoratingDefinitions[$inner];
                 $definition->setTags(array_merge($decoratingDefinition->getTags(), $definition->getTags()));
-                $decoratingDefinition->setTags(array());
+                $decoratingDefinition->setTags([]);
                 $decoratingDefinitions[$inner] = $definition;
             }
 

Compiler/MergeExtensionConfigurationPass.php

@@ -119,7 +119,7 @@ public function freezeAfterProcessing(Extension $extension, ContainerBuilder $co
             // Extension::processConfiguration() wasn't called, we cannot know how configs were merged
             return;
         }
-        $this->processedEnvPlaceholders = array();
+        $this->processedEnvPlaceholders = [];
 
         // serialize config and container to catch env vars nested in object graphs
         $config = serialize($config).serialize($container->getDefinitions()).serialize($container->getAliases()).serialize($container->getParameterBag()->all());
@@ -144,7 +144,7 @@ public function getEnvPlaceholders()
 
     public function getUnusedEnvPlaceholders(): array
     {
-        return null === $this->processedEnvPlaceholders ? array() : array_diff_key(parent::getEnvPlaceholders(), $this->processedEnvPlaceholders);
+        return null === $this->processedEnvPlaceholders ? [] : array_diff_key(parent::getEnvPlaceholders(), $this->processedEnvPlaceholders);
     }
 }