Skip to content

Commit

Permalink
Merge branch '3.4' into 4.4
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed May 23, 2020
2 parents 7c4bb04 + fbd216d commit 3adfbd7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions File/UploadedFile.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/
class UploadedFile extends File
{
private $test = false;
private $test;
private $originalName;
private $mimeType;
private $error;
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
*/
Expand Down

0 comments on commit 3adfbd7

Please sign in to comment.