Merge branch '4.2' into short-array-master

* 4.2:
  fixed CS
  fixed CS
  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

AbstractExtension.php

@@ -86,7 +86,7 @@ public function getTypeExtensions($name)
 
         return isset($this->typeExtensions[$name])
             ? $this->typeExtensions[$name]
-            : array();
+            : [];
     }
 
     /**
@@ -120,7 +120,7 @@ public function getTypeGuesser()
      */
     protected function loadTypes()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -130,7 +130,7 @@ protected function loadTypes()
      */
     protected function loadTypeExtensions()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -149,7 +149,7 @@ protected function loadTypeGuesser()
      */
     private function initTypes()
     {
-        $this->types = array();
+        $this->types = [];
 
         foreach ($this->loadTypes() as $type) {
             if (!$type instanceof FormTypeInterface) {
@@ -168,23 +168,23 @@ private function initTypes()
      */
     private function initTypeExtensions()
     {
-        $this->typeExtensions = array();
+        $this->typeExtensions = [];
 
         foreach ($this->loadTypeExtensions() as $extension) {
             if (!$extension instanceof FormTypeExtensionInterface) {
                 throw new UnexpectedTypeException($extension, 'Symfony\Component\Form\FormTypeExtensionInterface');
             }
 
             if (method_exists($extension, 'getExtendedTypes')) {
-                $extendedTypes = array();
+                $extendedTypes = [];
 
                 foreach ($extension::getExtendedTypes() as $extendedType) {
                     $extendedTypes[] = $extendedType;
                 }
             } else {
                 @trigger_error(sprintf('Not implementing the static getExtendedTypes() method in %s when implementing the %s is deprecated since Symfony 4.2. The method will be added to the interface in 5.0.', \get_class($extension), FormTypeExtensionInterface::class), E_USER_DEPRECATED);
 
-                $extendedTypes = array($extension->getExtendedType());
+                $extendedTypes = [$extension->getExtendedType()];
             }
 
             foreach ($extendedTypes as $extendedType) {

AbstractRendererEngine.php

@@ -24,19 +24,19 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface
     const CACHE_KEY_VAR = 'cache_key';
 
     protected $defaultThemes;
-    protected $themes = array();
-    protected $useDefaultThemes = array();
-    protected $resources = array();
+    protected $themes = [];
+    protected $useDefaultThemes = [];
+    protected $resources = [];
 
-    private $resourceHierarchyLevels = array();
+    private $resourceHierarchyLevels = [];
 
     /**
      * Creates a new renderer engine.
      *
      * @param array $defaultThemes The default themes. The type of these
      *                             themes is open to the implementation.
      */
-    public function __construct(array $defaultThemes = array())
+    public function __construct(array $defaultThemes = [])
     {
         $this->defaultThemes = $defaultThemes;
     }
@@ -49,7 +49,7 @@ public function setTheme(FormView $view, $themes, $useDefaultThemes = true)
         $cacheKey = $view->vars[self::CACHE_KEY_VAR];
 
         // Do not cast, as casting turns objects into arrays of properties
-        $this->themes[$cacheKey] = \is_array($themes) ? $themes : array($themes);
+        $this->themes[$cacheKey] = \is_array($themes) ? $themes : [$themes];
         $this->useDefaultThemes[$cacheKey] = (bool) $useDefaultThemes;
 
         // Unset instead of resetting to an empty array, in order to allow

Button.php

@@ -132,7 +132,7 @@ public function getParent()
      *
      * @throws BadMethodCallException
      */
-    public function add($child, $type = null, array $options = array())
+    public function add($child, $type = null, array $options = [])
     {
         throw new BadMethodCallException('Buttons cannot have children.');
     }
@@ -182,15 +182,15 @@ public function remove($name)
      */
     public function all()
     {
-        return array();
+        return [];
     }
 
     /**
      * {@inheritdoc}
      */
     public function getErrors($deep = false, $flatten = true)
     {
-        return new FormErrorIterator($this, array());
+        return new FormErrorIterator($this, []);
     }
 
     /**
@@ -234,7 +234,7 @@ public function getViewData()
      */
     public function getExtraData()
     {
-        return array();
+        return [];
     }
 
     /**

ButtonBuilder.php

@@ -45,7 +45,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
     /**
      * @var array
      */
-    private $attributes = array();
+    private $attributes = [];
 
     /**
      * @var array
@@ -55,7 +55,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
     /**
      * @throws InvalidArgumentException if the name is empty
      */
-    public function __construct(?string $name, array $options = array())
+    public function __construct(?string $name, array $options = [])
     {
         if ('' === $name || null === $name) {
             throw new InvalidArgumentException('Buttons cannot have empty names.');
@@ -76,7 +76,7 @@ public function __construct(?string $name, array $options = array())
      *
      * @throws BadMethodCallException
      */
-    public function add($child, $type = null, array $options = array())
+    public function add($child, $type = null, array $options = [])
     {
         throw new BadMethodCallException('Buttons cannot have children.');
     }
@@ -92,7 +92,7 @@ public function add($child, $type = null, array $options = array())
      *
      * @throws BadMethodCallException
      */
-    public function create($name, $type = null, array $options = array())
+    public function create($name, $type = null, array $options = [])
     {
         throw new BadMethodCallException('Buttons cannot have children.');
     }
@@ -144,7 +144,7 @@ public function has($name)
      */
     public function all()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -582,7 +582,7 @@ public function getType()
      */
     public function getViewTransformers()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -592,7 +592,7 @@ public function getViewTransformers()
      */
     public function getModelTransformers()
     {
-        return array();
+        return [];
     }
 
     /**

CHANGELOG.md

@@ -33,7 +33,7 @@ CHANGELOG
    {
        public static function getExtendedTypes(): iterable
        {
-           return array(FormType::class);
+           return [FormType::class];
        }
 
        // ...

ChoiceList/ArrayChoiceList.php

@@ -132,7 +132,7 @@ public function getOriginalKeys()
      */
     public function getChoicesForValues(array $values)
     {
-        $choices = array();
+        $choices = [];
 
         foreach ($values as $i => $givenValue) {
             if (array_key_exists($givenValue, $this->choices)) {
@@ -148,11 +148,11 @@ public function getChoicesForValues(array $values)
      */
     public function getValuesForChoices(array $choices)
     {
-        $values = array();
+        $values = [];
 
         // Use the value callback to compare choices by their values, if present
         if ($this->valueCallback) {
-            $givenValues = array();
+            $givenValues = [];
 
             foreach ($choices as $i => $givenChoice) {
                 $givenValues[$i] = (string) ($this->valueCallback)($givenChoice);
@@ -190,9 +190,9 @@ public function getValuesForChoices(array $choices)
     protected function flatten(array $choices, $value, &$choicesByValues, &$keysByValues, &$structuredValues)
     {
         if (null === $choicesByValues) {
-            $choicesByValues = array();
-            $keysByValues = array();
-            $structuredValues = array();
+            $choicesByValues = [];
+            $keysByValues = [];
+            $structuredValues = [];
         }
 
         foreach ($choices as $key => $choice) {
@@ -219,7 +219,7 @@ protected function flatten(array $choices, $value, &$choicesByValues, &$keysByVa
      * @return bool returns true if the choices can be cast to strings and
      *              false otherwise
      */
-    private function castableToString(array $choices, array &$cache = array())
+    private function castableToString(array $choices, array &$cache = [])
     {
         foreach ($choices as $choice) {
             if (\is_array($choice)) {

ChoiceList/ChoiceListInterface.php

@@ -48,19 +48,19 @@ public function getValues();
      * keys of the choices. If the original array contained nested arrays, these
      * nested arrays are represented here as well:
      *
-     *     $form->add('field', 'choice', array(
-     *         'choices' => array(
-     *             'Decided' => array('Yes' => true, 'No' => false),
-     *             'Undecided' => array('Maybe' => null),
-     *         ),
-     *     ));
+     *     $form->add('field', 'choice', [
+     *         'choices' => [
+     *             'Decided' => ['Yes' => true, 'No' => false],
+     *             'Undecided' => ['Maybe' => null],
+     *         ],
+     *     ]);
      *
      * In this example, the result of this method is:
      *
-     *     array(
-     *         'Decided' => array('Yes' => '0', 'No' => '1'),
-     *         'Undecided' => array('Maybe' => '2'),
-     *     )
+     *     [
+     *         'Decided' => ['Yes' => '0', 'No' => '1'],
+     *         'Undecided' => ['Maybe' => '2'],
+     *     ]
      *
      * @return string[] The choice values
      */
@@ -73,12 +73,12 @@ public function getStructuredValues();
      * "choice" option of the choice type. Note that this array may contain
      * duplicates if the "choice" option contained choice groups:
      *
-     *     $form->add('field', 'choice', array(
-     *         'choices' => array(
-     *             'Decided' => array(true, false),
-     *             'Undecided' => array(null),
-     *         ),
-     *     ));
+     *     $form->add('field', 'choice', [
+     *         'choices' => [
+     *             'Decided' => [true, false],
+     *             'Undecided' => [null],
+     *         ],
+     *     ]);
      *
      * In this example, the original key 0 appears twice, once for `true` and
      * once for `null`.

ChoiceList/Factory/CachingFactoryDecorator.php

@@ -27,12 +27,12 @@ class CachingFactoryDecorator implements ChoiceListFactoryInterface
     /**
      * @var ChoiceListInterface[]
      */
-    private $lists = array();
+    private $lists = [];
 
     /**
      * @var ChoiceListView[]
      */
-    private $views = array();
+    private $views = [];
 
     /**
      * Generates a SHA-256 hash for the given value.
@@ -89,7 +89,7 @@ public function createListFromChoices($choices, $value = null)
         // The value is not validated on purpose. The decorated factory may
         // decide which values to accept and which not.
 
-        $hash = self::generateHash(array($choices, $value), 'fromChoices');
+        $hash = self::generateHash([$choices, $value], 'fromChoices');
 
         if (!isset($this->lists[$hash])) {
             $this->lists[$hash] = $this->decoratedFactory->createListFromChoices($choices, $value);
@@ -103,7 +103,7 @@ public function createListFromChoices($choices, $value = null)
      */
     public function createListFromLoader(ChoiceLoaderInterface $loader, $value = null)
     {
-        $hash = self::generateHash(array($loader, $value), 'fromLoader');
+        $hash = self::generateHash([$loader, $value], 'fromLoader');
 
         if (!isset($this->lists[$hash])) {
             $this->lists[$hash] = $this->decoratedFactory->createListFromLoader($loader, $value);
@@ -119,7 +119,7 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
     {
         // The input is not validated on purpose. This way, the decorated
         // factory may decide which input to accept and which not.
-        $hash = self::generateHash(array($list, $preferredChoices, $label, $index, $groupBy, $attr));
+        $hash = self::generateHash([$list, $preferredChoices, $label, $index, $groupBy, $attr]);
 
         if (!isset($this->views[$hash])) {
             $this->views[$hash] = $this->decoratedFactory->createView(

ChoiceList/Factory/DefaultChoiceListFactory.php

@@ -47,8 +47,8 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
      */
     public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null)
     {
-        $preferredViews = array();
-        $otherViews = array();
+        $preferredViews = [];
+        $otherViews = [];
         $choices = $list->getChoices();
         $keys = $list->getOriginalKeys();
 
@@ -137,7 +137,7 @@ private static function addChoiceView($choice, $value, $label, $keys, &$index, $
             $label,
             // The attributes may be a callable or a mapping from choice indices
             // to nested arrays
-            \is_callable($attr) ? $attr($choice, $key, $value) : (isset($attr[$key]) ? $attr[$key] : array())
+            \is_callable($attr) ? $attr($choice, $key, $value) : (isset($attr[$key]) ? $attr[$key] : [])
         );
 
         // $isPreferred may be null if no choices are preferred
@@ -157,8 +157,8 @@ private static function addChoiceViewsGroupedBy($groupBy, $label, $choices, $key
 
             // Add the contents of groups to new ChoiceGroupView instances
             if (\is_array($value)) {
-                $preferredViewsForGroup = array();
-                $otherViewsForGroup = array();
+                $preferredViewsForGroup = [];
+                $otherViewsForGroup = [];
 
                 self::addChoiceViewsGroupedBy(
                     $value,

ChoiceList/Loader/CallbackChoiceLoader.php

@@ -56,7 +56,7 @@ public function loadChoicesForValues(array $values, $value = null)
     {
         // Optimize
         if (empty($values)) {
-            return array();
+            return [];
         }
 
         return $this->loadChoiceList($value)->getChoicesForValues($values);
@@ -69,7 +69,7 @@ public function loadValuesForChoices(array $choices, $value = null)
     {
         // Optimize
         if (empty($choices)) {
-            return array();
+            return [];
         }
 
         return $this->loadChoiceList($value)->getValuesForChoices($choices);