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

Issue #2952634 by Sut3kh, alexpott, Rob C, jibran: LegacyMessenger::deleteByType does not delete anything

8.7.x
Alex Pott 2018-07-16 10:08:24 +01:00
parent 1e8a4de636
commit 7353b6f170
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/Messenger/LegacyMessenger.php
View File

@ -180,7 +180,7 @@ class LegacyMessenger implements MessengerInterface {
public function deleteByType($type) {
// Proxy to the Messenger service, if it exists.
if ($messenger = $this->getMessengerService()) {
return $messenger->messagesByType($type);
return $messenger->deleteByType($type);
}
$messages = static::$messages[$type];

2
core/modules/file/tests/src/Functional/SaveUploadFormTest.php
View File

@ -424,7 +424,7 @@ class SaveUploadFormTest extends FileManagedTestBase {
// after calling _file_save_upload_from_form() are correct.
$this->assertText($error);
$this->assertRaw('Number of error messages before _file_save_upload_from_form(): 1');
$this->assertRaw('Number of error messages after _file_save_upload_from_form(): 2');
$this->assertRaw('Number of error messages after _file_save_upload_from_form(): 1');
// Test a successful upload with no messages.
$edit = [

5
core/tests/Drupal/KernelTests/Core/Messenger/MessengerLegacyTest.php
View File

@ -103,6 +103,11 @@ class MessengerLegacyTest extends KernelTestBase {
$this->assertCount(4, $messages[MessengerInterface::TYPE_STATUS]);
$this->assertCount(4, $messages[MessengerInterface::TYPE_WARNING]);
$this->assertCount(4, $messages[MessengerInterface::TYPE_ERROR]);
// Test deleteByType().
$this->assertCount(4, $messenger->deleteByType(MessengerInterface::TYPE_WARNING));
$this->assertCount(0, $messenger->messagesByType(MessengerInterface::TYPE_WARNING));
$this->assertCount(4, $messenger->messagesByType(MessengerInterface::TYPE_ERROR));
}
}