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

Constraint.php

@@ -49,7 +49,7 @@ abstract class Constraint
     /**
      * Maps error codes to the names of their constants.
      */
-    protected static $errorNames = array();
+    protected static $errorNames = [];
 
     /**
      * Domain-specific data attached to a constraint.
@@ -105,7 +105,7 @@ public static function getErrorName($errorCode)
      */
     public function __construct($options = null)
     {
-        $invalidOptions = array();
+        $invalidOptions = [];
         $missingOptions = array_flip((array) $this->getRequiredOptions());
         $knownOptions = get_object_vars($this);
 
@@ -173,7 +173,7 @@ public function __set($option, $value)
             return;
         }
 
-        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint %s', $option, \get_class($this)), array($option));
+        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint %s', $option, \get_class($this)), [$option]);
     }
 
     /**
@@ -194,12 +194,12 @@ public function __set($option, $value)
     public function __get($option)
     {
         if ('groups' === $option) {
-            $this->groups = array(self::DEFAULT_GROUP);
+            $this->groups = [self::DEFAULT_GROUP];
 
             return $this->groups;
         }
 
-        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint %s', $option, \get_class($this)), array($option));
+        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint %s', $option, \get_class($this)), [$option]);
     }
 
     /**
@@ -248,7 +248,7 @@ public function getDefaultOption()
      */
     public function getRequiredOptions()
     {
-        return array();
+        return [];
     }
 
     /**

ConstraintValidatorFactory.php

@@ -24,7 +24,7 @@
  */
 class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
 {
-    protected $validators = array();
+    protected $validators = [];
 
     public function __construct()
     {

ConstraintViolationList.php

@@ -21,14 +21,14 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
     /**
      * @var ConstraintViolationInterface[]
      */
-    private $violations = array();
+    private $violations = [];
 
     /**
      * Creates a new constraint violation list.
      *
      * @param ConstraintViolationInterface[] $violations The constraint violations to add to the list
      */
-    public function __construct(array $violations = array())
+    public function __construct(array $violations = [])
     {
         foreach ($violations as $violation) {
             $this->add($violation);
@@ -169,7 +169,7 @@ public function offsetUnset($offset)
     public function findByCodes($codes)
     {
         $codes = (array) $codes;
-        $violations = array();
+        $violations = [];
         foreach ($this as $violation) {
             if (\in_array($violation->getCode(), $codes, true)) {
                 $violations[] = $violation;

Constraints/AbstractComparison.php

@@ -33,7 +33,7 @@ abstract class AbstractComparison extends Constraint
     public function __construct($options = null)
     {
         if (null === $options) {
-            $options = array();
+            $options = [];
         }
 
         if (\is_array($options)) {

Constraints/All.php

@@ -19,7 +19,7 @@
  */
 class All extends Composite
 {
-    public $constraints = array();
+    public $constraints = [];
 
     public function getDefaultOption()
     {
@@ -28,7 +28,7 @@ public function getDefaultOption()
 
     public function getRequiredOptions()
     {
-        return array('constraints');
+        return ['constraints'];
     }
 
     protected function getCompositeOption()

Constraints/Bic.php

@@ -29,13 +29,13 @@ class Bic extends Constraint
     const INVALID_COUNTRY_CODE_ERROR = '1ce76f8d-3c1f-451c-9e62-fe9c3ed486ae';
     const INVALID_CASE_ERROR = '11884038-3312-4ae5-9d04-699f782130c7';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::INVALID_LENGTH_ERROR => 'INVALID_LENGTH_ERROR',
         self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
         self::INVALID_BANK_CODE_ERROR => 'INVALID_BANK_CODE_ERROR',
         self::INVALID_COUNTRY_CODE_ERROR => 'INVALID_COUNTRY_CODE_ERROR',
         self::INVALID_CASE_ERROR => 'INVALID_CASE_ERROR',
-    );
+    ];
 
     public $message = 'This is not a valid Business Identifier Code (BIC).';
 

Constraints/BicValidator.php

@@ -45,7 +45,7 @@ public function validate($value, Constraint $constraint)
         $canonicalize = str_replace(' ', '', $value);
 
         // the bic must be either 8 or 11 characters long
-        if (!\in_array(\strlen($canonicalize), array(8, 11))) {
+        if (!\in_array(\strlen($canonicalize), [8, 11])) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->setCode(Bic::INVALID_LENGTH_ERROR)

Constraints/Blank.php

@@ -23,9 +23,9 @@ class Blank extends Constraint
 {
     const NOT_BLANK_ERROR = '183ad2de-533d-4796-a439-6d3c3852b549';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NOT_BLANK_ERROR => 'NOT_BLANK_ERROR',
-    );
+    ];
 
     public $message = 'This value should be blank.';
 }

Constraints/Callback.php

@@ -37,7 +37,7 @@ public function __construct($options = null)
         }
 
         if (\is_array($options) && !isset($options['callback']) && !isset($options['groups']) && !isset($options['payload'])) {
-            $options = array('callback' => $options);
+            $options = ['callback' => $options];
         }
 
         parent::__construct($options);
@@ -56,6 +56,6 @@ public function getDefaultOption()
      */
     public function getTargets()
     {
-        return array(self::CLASS_CONSTRAINT, self::PROPERTY_CONSTRAINT);
+        return [self::CLASS_CONSTRAINT, self::PROPERTY_CONSTRAINT];
     }
 }

Constraints/CardScheme.php

@@ -27,10 +27,10 @@ class CardScheme extends Constraint
     const NOT_NUMERIC_ERROR = 'a2ad9231-e827-485f-8a1e-ef4d9a6d5c2e';
     const INVALID_FORMAT_ERROR = 'a8faedbf-1c2f-4695-8d22-55783be8efed';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NOT_NUMERIC_ERROR => 'NOT_NUMERIC_ERROR',
         self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
-    );
+    ];
 
     public $message = 'Unsupported card type or invalid card number.';
     public $schemes;
@@ -42,6 +42,6 @@ public function getDefaultOption()
 
     public function getRequiredOptions()
     {
-        return array('schemes');
+        return ['schemes'];
     }
 }