Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 3adfbd7098c8 · 2020-05-23T11:11:46.000+02:00
* 3.4:
  Skip Doctrine DBAL on php 8 until we have a compatible version.
  [DomCrawler] Catch expected ValueError.
  [Validator] Catch expected ValueError.
  [VarDumper] ReflectionFunction::isDisabled() is deprecated.
  [PropertyAccess] Parse php 8 TypeErrors correctly.
  [Intl] Fix call to ReflectionProperty::getValue() for static properties.
  [HttpKernel] Prevent calling method_exists() with non-string values.
  [Debug] php 8 does not pass $context to error handlers.
  [Config] Removed implicit cast of ReflectionProperty to string.
  [Debug] Undefined variables raise a warning in php 8.
  [Debug] Skip test that would trigger a fatal error on php 8.
  Address deprecation of ReflectionType::getClass().
  Properties $originalName and $mimeType are never null in UploadedFile
diff --git a/File/UploadedFile.php b/File/UploadedFile.php
@@ -31,7 +31,7 @@
  */
 class UploadedFile extends File
 {
-    private $test = false;
+    private $test;
     private $originalName;
     private $mimeType;
     private $error;
@@ -83,7 +83,7 @@ public function __construct(string $path, string $originalName, string $mimeType
      * It is extracted from the request from which the file has been uploaded.
      * Then it should not be considered as a safe value.
      *
-     * @return string|null The original name
+     * @return string The original name
      */
     public function getClientOriginalName()
     {
@@ -112,7 +112,7 @@ public function getClientOriginalExtension()
      * For a trusted mime type, use getMimeType() instead (which guesses the mime
      * type based on the file content).
      *
-     * @return string|null The mime type
+     * @return string The mime type
      *
      * @see getMimeType()
      */

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`*/`
`32`	`32`	`class UploadedFile extends File`
`33`	`33`	`{`
`34`		`- private $test = false;`
	`34`	`+ private $test;`
`35`	`35`	`private $originalName;`
`36`	`36`	`private $mimeType;`
`37`	`37`	`private $error;`
`@@ -83,7 +83,7 @@ public function __construct(string $path, string $originalName, string $mimeType`
`83`	`83`	`* It is extracted from the request from which the file has been uploaded.`
`84`	`84`	`* Then it should not be considered as a safe value.`
`85`	`85`	`*`
`86`		`- * @return string\|null The original name`
	`86`	`+ * @return string The original name`
`87`	`87`	`*/`
`88`	`88`	`public function getClientOriginalName()`
`89`	`89`	`{`
`@@ -112,7 +112,7 @@ public function getClientOriginalExtension()`
`112`	`112`	`* For a trusted mime type, use getMimeType() instead (which guesses the mime`
`113`	`113`	`* type based on the file content).`
`114`	`114`	`*`
`115`		`- * @return string\|null The mime type`
	`115`	`+ * @return string The mime type`
`116`	`116`	`*`
`117`	`117`	`* @see getMimeType()`
`118`	`118`	`*/`