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

Dotenv.php

@@ -65,7 +65,7 @@ public function load(string $path, string ...$extraPaths): void
      * @throws FormatException when a file has a syntax error
      * @throws PathException   when a file does not exist or is not readable
      */
-    public function loadEnv(string $path, string $varName = 'APP_ENV', string $defaultEnv = 'dev', array $testEnvs = array('test')): void
+    public function loadEnv(string $path, string $varName = 'APP_ENV', string $defaultEnv = 'dev', array $testEnvs = ['test']): void
     {
         if (file_exists($path) || !file_exists($p = "$path.dist")) {
             $this->load($path);
@@ -74,7 +74,7 @@ public function loadEnv(string $path, string $varName = 'APP_ENV', string $defau
         }
 
         if (null === $env = $_SERVER[$varName] ?? $_ENV[$varName] ?? null) {
-            $this->populate(array($varName => $env = $defaultEnv));
+            $this->populate([$varName => $env = $defaultEnv]);
         }
 
         if (!\in_array($env, $testEnvs, true) && file_exists($p = "$path.local")) {
@@ -158,12 +158,12 @@ public function populate(array $values, bool $overrideExistingVars = false): voi
     public function parse(string $data, string $path = '.env'): array
     {
         $this->path = $path;
-        $this->data = str_replace(array("\r\n", "\r"), "\n", $data);
+        $this->data = str_replace(["\r\n", "\r"], "\n", $data);
         $this->lineno = 1;
         $this->cursor = 0;
         $this->end = \strlen($this->data);
         $this->state = self::STATE_VARNAME;
-        $this->values = array();
+        $this->values = [];
         $name = '';
 
         $this->skipEmptyLines();
@@ -189,7 +189,7 @@ public function parse(string $data, string $path = '.env'): array
         try {
             return $this->values;
         } finally {
-            $this->values = array();
+            $this->values = [];
             $this->data = null;
             $this->path = null;
         }
@@ -272,7 +272,7 @@ private function lexValue()
                     }
                 }
                 ++$this->cursor;
-                $value = str_replace(array('\\"', '\r', '\n'), array('"', "\r", "\n"), $value);
+                $value = str_replace(['\\"', '\r', '\n'], ['"', "\r", "\n"], $value);
                 $resolvedValue = $value;
                 $resolvedValue = $this->resolveVariables($resolvedValue);
                 $resolvedValue = $this->resolveCommands($resolvedValue);
@@ -281,7 +281,7 @@ private function lexValue()
             } else {
                 $value = '';
                 $prevChr = $this->data[$this->cursor - 1];
-                while ($this->cursor < $this->end && !\in_array($this->data[$this->cursor], array("\n", '"', "'"), true) && !((' ' === $prevChr || "\t" === $prevChr) && '#' === $this->data[$this->cursor])) {
+                while ($this->cursor < $this->end && !\in_array($this->data[$this->cursor], ["\n", '"', "'"], true) && !((' ' === $prevChr || "\t" === $prevChr) && '#' === $this->data[$this->cursor])) {
                     if ('\\' === $this->data[$this->cursor] && isset($this->data[$this->cursor + 1]) && ('"' === $this->data[$this->cursor + 1] || "'" === $this->data[$this->cursor + 1])) {
                         ++$this->cursor;
                     }