Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3070072 by mikelutz: Fix use of deprecated file_upload_max_size() in _file_save_upload_single() of file.module

merge-requests/55/head
catch 2019-07-31 08:44:23 +01:00
parent d68cb0766b
commit 7d995bb198
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/modules/file/file.module
View File

@ -5,6 +5,7 @@
* Defines a "managed_file" Form API field and a "file" field for Field module. * Defines a "managed_file" Form API field and a "file" field for Field module.
*/ */
use Drupal\Component\Utility\Environment;
use Drupal\Core\Datetime\Entity\DateFormat; use Drupal\Core\Datetime\Entity\DateFormat;
use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\File\Exception\FileException; use Drupal\Core\File\Exception\FileException;
@ -962,7 +963,7 @@ function _file_save_upload_single(\SplFileInfo $file_info, $form_field_name, $va
switch ($file_info->getError()) { switch ($file_info->getError()) {
case UPLOAD_ERR_INI_SIZE: case UPLOAD_ERR_INI_SIZE:
case UPLOAD_ERR_FORM_SIZE: case UPLOAD_ERR_FORM_SIZE:
\Drupal::messenger()->addError(t('The file %file could not be saved because it exceeds %maxsize, the maximum allowed size for uploads.', ['%file' => $file_info->getFilename(), '%maxsize' => format_size(file_upload_max_size())])); \Drupal::messenger()->addError(t('The file %file could not be saved because it exceeds %maxsize, the maximum allowed size for uploads.', ['%file' => $file_info->getFilename(), '%maxsize' => format_size(Environment::getUploadMaxSize())]));
return FALSE; return FALSE;
case UPLOAD_ERR_PARTIAL: case UPLOAD_ERR_PARTIAL:

37
core/modules/file/tests/src/Kernel/FileModuleTest.php Normal file
View File

@ -0,0 +1,37 @@
<?php
namespace Drupal\Tests\file\Kernel;
use Drupal\Component\Utility\Environment;
use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\KernelTests\KernelTestBase;
use Symfony\Component\HttpFoundation\File\UploadedFile;
/**
* Tests file.module methods.
*
* @group file
*/
class FileModuleTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
public static $modules = ['file'];
/**
* Tests file size upload errors.
*
* @throws \Drupal\Core\Entity\EntityStorageException
*/
public function testFileSaveUploadSingleErrorFormSize() {
$file_name = $this->randomMachineName();
$file_info = $this->createMock(UploadedFile::class);
$file_info->expects($this->once())->method('getError')->willReturn(UPLOAD_ERR_FORM_SIZE);
$file_info->expects($this->once())->method('getFileName')->willReturn($file_name);
$this->assertFalse(\_file_save_upload_single($file_info, 'name'));
$expected_message = new TranslatableMarkup('The file %file could not be saved because it exceeds %maxsize, the maximum allowed size for uploads.', ['%file' => $file_name, '%maxsize' => format_size(Environment::getUploadMaxSize())]);
$this->assertEquals($expected_message, \Drupal::messenger()->all()['error'][0]);
}
}