Merge branch '4.4' into 5.2

* 4.4:
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [Form] better form doc types to support static analysis

Author: nicolas-grekas

File/UploadedFile.php

@@ -231,7 +231,7 @@ public static function getMaxFilesize()
      *
      * @return int|float Returns float if size > PHP_INT_MAX
      */
-    private static function parseFilesize($size)
+    private static function parseFilesize(string $size)
     {
         if ('' === $size) {
             return 0;

FileBag.php

@@ -75,22 +75,20 @@ protected function convertFileInformation($file)
             return $file;
         }
 
-        if (\is_array($file)) {
-            $file = $this->fixPhpFilesArray($file);
-            $keys = array_keys($file);
-            sort($keys);
-
-            if (self::FILE_KEYS == $keys) {
-                if (\UPLOAD_ERR_NO_FILE == $file['error']) {
-                    $file = null;
-                } else {
-                    $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['error'], false);
-                }
+        $file = $this->fixPhpFilesArray($file);
+        $keys = array_keys($file);
+        sort($keys);
+
+        if (self::FILE_KEYS == $keys) {
+            if (\UPLOAD_ERR_NO_FILE == $file['error']) {
+                $file = null;
             } else {
-                $file = array_map([$this, 'convertFileInformation'], $file);
-                if (array_keys($keys) === $keys) {
-                    $file = array_filter($file);
-                }
+                $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['error'], false);
+            }
+        } else {
+            $file = array_map(function ($v) { return $v instanceof UploadedFile || \is_array($v) ? $this->convertFileInformation($v) : $v; }, $file);
+            if (array_keys($keys) === $keys) {
+                $file = array_filter($file);
             }
         }
 

HeaderBag.php

@@ -123,8 +123,8 @@ public function get(string $key, string $default = null)
     /**
      * Sets a header by name.
      *
-     * @param string|string[] $values  The value or an array of values
-     * @param bool            $replace Whether to replace the actual value or not (true by default)
+     * @param string|string[]|null $values  The value or an array of values
+     * @param bool                 $replace Whether to replace the actual value or not (true by default)
      */
     public function set(string $key, $values, bool $replace = true)
     {
@@ -208,7 +208,7 @@ public function getDate(string $key, \DateTime $default = null)
     /**
      * Adds a custom Cache-Control directive.
      *
-     * @param mixed $value The Cache-Control directive value
+     * @param bool|string $value The Cache-Control directive value
      */
     public function addCacheControlDirective(string $key, $value = true)
     {
@@ -230,11 +230,11 @@ public function hasCacheControlDirective(string $key)
     /**
      * Returns a Cache-Control directive value by name.
      *
-     * @return mixed The directive value if defined, null otherwise
+     * @return bool|string|null The directive value if defined, null otherwise
      */
     public function getCacheControlDirective(string $key)
     {
-        return \array_key_exists($key, $this->cacheControl) ? $this->cacheControl[$key] : null;
+        return $this->cacheControl[$key] ?? null;
     }
 
     /**

Tests/JsonResponseTest.php

@@ -276,7 +276,7 @@ public function testConstructorWithNullAsDataThrowsAnUnexpectedValueException()
     public function testConstructorWithObjectWithToStringMethod()
     {
         $class = new class() {
-            public function __toString()
+            public function __toString(): string
             {
                 return '{}';
             }

Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php

@@ -122,7 +122,7 @@ public function testUpdateTimestamp()
         $lowTtl = 10;
 
         $this->redisClient->setex(self::PREFIX.'id', $lowTtl, 'foo');
-        $this->storage->updateTimestamp('id', []);
+        $this->storage->updateTimestamp('id', 'data');
 
         $this->assertGreaterThan($lowTtl, $this->redisClient->ttl(self::PREFIX.'id'));
     }