diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch bamarni/fileupload-message (PR #8216) 

This PR was merged into the master branch.

Discussion
----------

[HttpFoundation] UploadedFile error message

Allowed error message to be retrieved manually, currently it's only used for the exception thrown when trying to move it.

I've also removed the argument, as it's not a static method it's not needed imo.

Commits
-------

7ccfe65 [HttpFoundation] UploadedFile error message
This commit is contained in:
Fabien Potencier 2013-06-08 17:03:18 +02:00
parent ea913e07e5 7ccfe655bd
commit 33469ea11b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Symfony/Component/HttpFoundation/File/UploadedFile.php
View File

@ -252,7 +252,7 @@ class UploadedFile extends File
return $target;
}
throw new FileException($this->getErrorMessage($this->getError()));
throw new FileException($this->getErrorMessage());
}
/**
@ -281,11 +281,9 @@ class UploadedFile extends File
/**
* Returns an informative upload error message.
*
* @param int $code The error code returned by an upload attempt
*
* @return string The error message regarding the specified error code
*/
private function getErrorMessage($errorCode)
public function getErrorMessage()
{
static $errors = array(
UPLOAD_ERR_INI_SIZE => 'The file "%s" exceeds your upload_max_filesize ini directive (limit is %d kb).',
@ -297,6 +295,7 @@ class UploadedFile extends File
UPLOAD_ERR_EXTENSION => 'File upload was stopped by a php extension.',
);
$errorCode = $this->error;
$maxFilesize = $errorCode === UPLOAD_ERR_INI_SIZE ? self::getMaxFilesize() / 1024 : 0;
$message = isset($errors[$errorCode]) ? $errors[$errorCode] : 'The file "%s" was not uploaded due to an unknown error.';