From 4fdf72574b2dbe8ca38ad087102070fa4e44feeb Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 16 Jul 2018 10:22:02 +0100
Subject: [PATCH] Revert "Issue #2952634 by Sut3kh, alexpott, Rob C, jibran:
LegacyMessenger::deleteByType does not delete anything"
This reverts commit cbe0ec99f61a21112d230af2a5ce20e134802f1d.
---
core/lib/Drupal/Core/Messenger/LegacyMessenger.php | 2 +-
core/modules/file/src/Tests/SaveUploadFormTest.php | 2 +-
.../KernelTests/Core/Messenger/MessengerLegacyTest.php | 5 -----
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/core/lib/Drupal/Core/Messenger/LegacyMessenger.php b/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
index 35e3609a52e9..ff323d20f94d 100644
--- a/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
+++ b/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
@@ -180,7 +180,7 @@ public function deleteAll() {
public function deleteByType($type) {
// Proxy to the Messenger service, if it exists.
if ($messenger = $this->getMessengerService()) {
- return $messenger->deleteByType($type);
+ return $messenger->messagesByType($type);
}
$messages = static::$messages[$type];
diff --git a/core/modules/file/src/Tests/SaveUploadFormTest.php b/core/modules/file/src/Tests/SaveUploadFormTest.php
index e568070616d5..07ebd1dc24f0 100644
--- a/core/modules/file/src/Tests/SaveUploadFormTest.php
+++ b/core/modules/file/src/Tests/SaveUploadFormTest.php
@@ -419,7 +419,7 @@ public function testErrorMessagesAreNotChanged() {
// 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(): 1');
+ $this->assertRaw('Number of error messages after _file_save_upload_from_form(): 2');
// Test a successful upload with no messages.
$edit = [
diff --git a/core/tests/Drupal/KernelTests/Core/Messenger/MessengerLegacyTest.php b/core/tests/Drupal/KernelTests/Core/Messenger/MessengerLegacyTest.php
index be687f8c593f..29334647db17 100644
--- a/core/tests/Drupal/KernelTests/Core/Messenger/MessengerLegacyTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Messenger/MessengerLegacyTest.php
@@ -103,11 +103,6 @@ public function testMessages() {
$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));
}
}
--
GitLab