Skip to content

Commit c9b0348

Browse files
Merge branch '4.4' into 5.0
* 4.4: (27 commits) [Serializer] minor cleanup fix merge Run PHP 8 as 7.4.99 Remove calls to deprecated ReflectionParameter::getClass(). [VarDumper] fix PHP 8 support Add php 8 to travis. [Cache] Accessing undefined constants raises an Error in php8 [Cache] allow DBAL v3 Skip Doctrine DBAL on php 8 until we have a compatible version. [DomCrawler] Catch expected ValueError. Made method signatures compatible with their corresponding traits. [ErrorHandler] Apply php8 fixes from Debug component. [DomCrawler] Catch expected ValueError. [Validator] Catch expected ValueError. [VarDumper] ReflectionFunction::isDisabled() is deprecated. [BrowserKit] Raw body with custom Content-Type header [PropertyAccess] Parse php 8 TypeErrors correctly. [Intl] Fix call to ReflectionProperty::getValue() for static properties. [HttpKernel] Prevent calling method_exists() with non-string values. Fix wrong roles comparison ...
2 parents 9272202 + 3adfbd7 commit c9b0348

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;
@@ -76,7 +76,7 @@ public function __construct(string $path, string $originalName, string $mimeType
7676
* It is extracted from the request from which the file has been uploaded.
7777
* Then it should not be considered as a safe value.
7878
*
79-
* @return string|null The original name
79+
* @return string The original name
8080
*/
8181
public function getClientOriginalName()
8282
{
@@ -105,7 +105,7 @@ public function getClientOriginalExtension()
105105
* For a trusted mime type, use getMimeType() instead (which guesses the mime
106106
* type based on the file content).
107107
*
108-
* @return string|null The mime type
108+
* @return string The mime type
109109
*
110110
* @see getMimeType()
111111
*/

0 commit comments

Comments
 (0)