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

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/RememberMeToken.php

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

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/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) {
@@ -53,6 +53,6 @@ public function getFunctions()
             }, function (array $variables, $role) {
                 return \in_array($role, $variables['roles']);
             }),
-        );
+        ];
     }
 }

Core/Authorization/TraceableAccessDecisionManager.php

@@ -26,8 +26,8 @@ class TraceableAccessDecisionManager implements AccessDecisionManagerInterface
 {
     private $manager;
     private $strategy;
-    private $voters = array();
-    private $decisionLog = array();
+    private $voters = [];
+    private $decisionLog = [];
 
     public function __construct(AccessDecisionManagerInterface $manager)
     {
@@ -51,11 +51,11 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
     {
         $result = $this->manager->decide($token, $attributes, $object);
 
-        $this->decisionLog[] = array(
+        $this->decisionLog[] = [
             'attributes' => $attributes,
             'object' => $object,
             'result' => $result,
-        );
+        ];
 
         return $result;
     }

Core/Authorization/Voter/ExpressionVoter.php

@@ -80,14 +80,14 @@ private function getVariables(TokenInterface $token, $subject)
             $roles = $token->getRoles();
         }
 
-        $variables = array(
+        $variables = [
             'token' => $token,
             'user' => $token->getUser(),
             'object' => $subject,
             'subject' => $subject,
             'roles' => array_map(function ($role) { return $role->getRole(); }, $roles),
             'trust_resolver' => $this->trustResolver,
-        );
+        ];
 
         // this is mainly to propose a better experience when the expression is used
         // in an access control rule, as the developer does not know that it's going

Core/Encoder/BCryptPasswordEncoder.php

@@ -64,7 +64,7 @@ public function encodePassword($raw, $salt)
             throw new BadCredentialsException('Invalid password.');
         }
 
-        $options = array('cost' => $this->cost);
+        $options = ['cost' => $this->cost];
 
         if ($salt) {
             // Ignore $salt, the auto-generated one is always the best

Core/Encoder/BasePasswordEncoder.php

@@ -30,7 +30,7 @@ abstract class BasePasswordEncoder implements PasswordEncoderInterface
     protected function demergePasswordAndSalt($mergedPasswordSalt)
     {
         if (empty($mergedPasswordSalt)) {
-            return array('', '');
+            return ['', ''];
         }
 
         $password = $mergedPasswordSalt;
@@ -42,7 +42,7 @@ protected function demergePasswordAndSalt($mergedPasswordSalt)
             $password = substr($mergedPasswordSalt, 0, $saltBegins);
         }
 
-        return array($password, $salt);
+        return [$password, $salt];
     }
 
     /**

Core/Exception/AccessDeniedException.php

@@ -18,7 +18,7 @@
  */
 class AccessDeniedException extends RuntimeException
 {
-    private $attributes = array();
+    private $attributes = [];
     private $subject;
 
     public function __construct(string $message = 'Access Denied.', \Exception $previous = null)