Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit deb246ab200a · 2021-07-02T17:14:39.000+02:00
* 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
diff --git a/Filesystem.php b/Filesystem.php
@@ -732,7 +732,7 @@ private static function box(callable $func, ...$args)
     /**
      * @internal
      */
-    public static function handleError($type, $msg)
+    public static function handleError(int $type, string $msg)
     {
         self::$lastError = $msg;
     }
diff --git a/Tests/Fixtures/MockStream/MockStream.php b/Tests/Fixtures/MockStream/MockStream.php
@@ -33,7 +33,7 @@ public function stream_open($path, $mode, $options, &$opened_path): bool
 
     /**
      * @param string $path  The file path or URL to stat
-     * @param array  $flags Holds additional flags set by the streams API
+     * @param int    $flags Holds additional flags set by the streams API
      *
      * @return array File stats
      */

Original file line number	Diff line number	Diff line change
`@@ -732,7 +732,7 @@ private static function box(callable $func, ...$args)`
`732`	`732`	`/**`
`733`	`733`	`* @internal`
`734`	`734`	`*/`
`735`		`- public static function handleError($type, $msg)`
	`735`	`+ public static function handleError(int $type, string $msg)`
`736`	`736`	`{`
`737`	`737`	`self::$lastError = $msg;`
`738`	`738`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function stream_open($path, $mode, $options, &$opened_path): bool`
`33`	`33`
`34`	`34`	`/**`
`35`	`35`	`* @param string $path The file path or URL to stat`
`36`		`- * @param array $flags Holds additional flags set by the streams API`
	`36`	`+ * @param int $flags Holds additional flags set by the streams API`
`37`	`37`	`*`
`38`	`38`	`* @return array File stats`
`39`	`39`	`*/`