diff -u b/core/modules/file/tests/src/Kernel/FileModuleTest.php b/core/modules/file/tests/src/Kernel/FileModuleTest.php --- b/core/modules/file/tests/src/Kernel/FileModuleTest.php +++ b/core/modules/file/tests/src/Kernel/FileModuleTest.php @@ -2,6 +2,7 @@ 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; @@ -44,7 +45,13 @@ ->execute() ->fetchAll(); $actual_log_message = $results[0]->message; - $expected_log_message = sprintf($expected_log_message, $file_name); + if ($error == UPLOAD_ERR_INI_SIZE || $error == UPLOAD_ERR_FORM_SIZE) { + $upload_size = format_size(Environment::getUploadMaxSize())->render(); + $expected_log_message = sprintf($expected_log_message, $file_name, $upload_size); + } + else { + $expected_log_message = sprintf($expected_log_message, $file_name); + } $this->assertSame($expected_log_message, $actual_log_message); } @@ -52,14 +59,15 @@ * Data provider for testFileSaveUploadSingle. */ public function providerFileSaveUploadSingle() { + return [ [ UPLOAD_ERR_INI_SIZE, - 'The file %s could not be saved because it exceeds 100 MB, the maximum allowed size for uploads.', + 'The file %s could not be saved because it exceeds %s, the maximum allowed size for uploads.', ], [ UPLOAD_ERR_FORM_SIZE, - 'The file %s could not be saved because it exceeds 100 MB, the maximum allowed size for uploads.', + 'The file %s could not be saved because it exceeds %s, the maximum allowed size for uploads.', ], [ UPLOAD_ERR_PARTIAL,