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

Core/Authentication/RememberMe/InMemoryTokenProvider.php

@@ -20,7 +20,7 @@
  */
 class InMemoryTokenProvider implements TokenProviderInterface
 {
-    private $tokens = array();
+    private $tokens = [];
 
     /**
      * {@inheritdoc}

Core/Authentication/Token/AbstractToken.php

@@ -25,16 +25,16 @@
 abstract class AbstractToken implements TokenInterface
 {
     private $user;
-    private $roles = array();
+    private $roles = [];
     private $authenticated = false;
-    private $attributes = array();
+    private $attributes = [];
 
     /**
      * @param (Role|string)[] $roles An array of roles
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(array $roles = array())
+    public function __construct(array $roles = [])
     {
         foreach ($roles as $role) {
             if (\is_string($role)) {
@@ -137,12 +137,12 @@ public function eraseCredentials()
     public function serialize()
     {
         return serialize(
-            array(
+            [
                 \is_object($this->user) ? clone $this->user : $this->user,
                 $this->authenticated,
                 array_map(function ($role) { return clone $role; }, $this->roles),
                 $this->attributes,
-            )
+            ]
         );
     }
 
@@ -223,7 +223,7 @@ public function __toString()
         $class = \get_class($this);
         $class = substr($class, strrpos($class, '\\') + 1);
 
-        $roles = array();
+        $roles = [];
         foreach ($this->roles as $role) {
             $roles[] = $role->getRole();
         }

Core/Authentication/Token/AnonymousToken.php

@@ -27,7 +27,7 @@ class AnonymousToken extends AbstractToken
      * @param string|object $user   The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string
      * @param Role[]        $roles  An array of roles
      */
-    public function __construct(string $secret, $user, array $roles = array())
+    public function __construct(string $secret, $user, array $roles = [])
     {
         parent::__construct($roles);
 
@@ -59,7 +59,7 @@ public function getSecret()
      */
     public function serialize()
     {
-        return serialize(array($this->secret, parent::serialize()));
+        return serialize([$this->secret, parent::serialize()]);
     }
 
     /**

Core/Authentication/Token/PreAuthenticatedToken.php

@@ -29,7 +29,7 @@ class PreAuthenticatedToken extends AbstractToken
      * @param string          $providerKey The provider key
      * @param (Role|string)[] $roles       An array of roles
      */
-    public function __construct($user, $credentials, string $providerKey, array $roles = array())
+    public function __construct($user, $credentials, string $providerKey, array $roles = [])
     {
         parent::__construct($roles);
 
@@ -79,7 +79,7 @@ public function eraseCredentials()
      */
     public function serialize()
     {
-        return serialize(array($this->credentials, $this->providerKey, parent::serialize()));
+        return serialize([$this->credentials, $this->providerKey, parent::serialize()]);
     }
 
     /**

Core/Authentication/Token/RememberMeToken.php

@@ -94,11 +94,11 @@ public function getCredentials()
      */
     public function serialize()
     {
-        return serialize(array(
+        return serialize([
             $this->secret,
             $this->providerKey,
             parent::serialize(),
-        ));
+        ]);
     }
 
     /**

Core/Authentication/Token/UsernamePasswordToken.php

@@ -31,7 +31,7 @@ class UsernamePasswordToken extends AbstractToken
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct($user, $credentials, string $providerKey, array $roles = array())
+    public function __construct($user, $credentials, string $providerKey, array $roles = [])
     {
         parent::__construct($roles);
 
@@ -91,7 +91,7 @@ public function eraseCredentials()
      */
     public function serialize()
     {
-        return serialize(array($this->credentials, $this->providerKey, parent::serialize()));
+        return serialize([$this->credentials, $this->providerKey, parent::serialize()]);
     }
 
     /**

Core/Authorization/AccessDecisionManager.php

@@ -39,10 +39,10 @@ class AccessDecisionManager implements AccessDecisionManagerInterface
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(iterable $voters = array(), string $strategy = self::STRATEGY_AFFIRMATIVE, bool $allowIfAllAbstainDecisions = false, bool $allowIfEqualGrantedDeniedDecisions = true)
+    public function __construct(iterable $voters = [], string $strategy = self::STRATEGY_AFFIRMATIVE, bool $allowIfAllAbstainDecisions = false, bool $allowIfEqualGrantedDeniedDecisions = true)
     {
         $strategyMethod = 'decide'.ucfirst($strategy);
-        if (!\is_callable(array($this, $strategyMethod))) {
+        if (!\is_callable([$this, $strategyMethod])) {
             throw new \InvalidArgumentException(sprintf('The strategy "%s" is not supported.', $strategy));
         }
 
@@ -152,7 +152,7 @@ private function decideUnanimous(TokenInterface $token, array $attributes, $obje
         $grant = 0;
         foreach ($this->voters as $voter) {
             foreach ($attributes as $attribute) {
-                $result = $voter->vote($token, $object, array($attribute));
+                $result = $voter->vote($token, $object, [$attribute]);
 
                 switch ($result) {
                     case VoterInterface::ACCESS_GRANTED:

Core/Authorization/AuthorizationChecker.php

@@ -54,7 +54,7 @@ final public function isGranted($attributes, $subject = null)
         }
 
         if (!\is_array($attributes)) {
-            $attributes = array($attributes);
+            $attributes = [$attributes];
         }
 
         return $this->accessDecisionManager->decide($token, $attributes, $subject);

Core/Authorization/ExpressionLanguage.php

@@ -29,7 +29,7 @@ class ExpressionLanguage extends BaseExpressionLanguage
         /**
          * {@inheritdoc}
          */
-        public function __construct(CacheItemPoolInterface $cache = null, array $providers = array())
+        public function __construct(CacheItemPoolInterface $cache = null, array $providers = [])
         {
             // prepend the default provider to let users override it easily
             array_unshift($providers, new ExpressionLanguageProvider());

Core/Authorization/ExpressionLanguageProvider.php

@@ -23,7 +23,7 @@ class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface
 {
     public function getFunctions()
     {
-        return array(
+        return [
             new ExpressionFunction('is_anonymous', function () {
                 return '$trust_resolver->isAnonymous($token)';
             }, function (array $variables) {
@@ -63,6 +63,6 @@ public function getFunctions()
 
                 return \in_array($role, $variables['roles']);
             }),
-        );
+        ];
     }
 }