Skip to content

Commit 3adfbd7

Browse files
Merge branch '3.4' into 4.4
* 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
2 parents 7c4bb04 + fbd216d commit 3adfbd7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

File/UploadedFile.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*/
3232
class UploadedFile extends File
3333
{
34-
private $test = false;
34+
private $test;
3535
private $originalName;
3636
private $mimeType;
3737
private $error;
@@ -83,7 +83,7 @@ public function __construct(string $path, string $originalName, string $mimeType
8383
* It is extracted from the request from which the file has been uploaded.
8484
* Then it should not be considered as a safe value.
8585
*
86-
* @return string|null The original name
86+
* @return string The original name
8787
*/
8888
public function getClientOriginalName()
8989
{
@@ -112,7 +112,7 @@ public function getClientOriginalExtension()
112112
* For a trusted mime type, use getMimeType() instead (which guesses the mime
113113
* type based on the file content).
114114
*
115-
* @return string|null The mime type
115+
* @return string The mime type
116116
*
117117
* @see getMimeType()
118118
*/

0 commit comments

Comments
 (0)