diff --git a/core/lib/Drupal/Core/Messenger/LegacyMessenger.php b/core/lib/Drupal/Core/Messenger/LegacyMessenger.php index 989b3f78bf..9ca91d29e8 100644 --- a/core/lib/Drupal/Core/Messenger/LegacyMessenger.php +++ b/core/lib/Drupal/Core/Messenger/LegacyMessenger.php @@ -95,7 +95,7 @@ public function all() { * @return \Drupal\Core\Messenger\MessengerInterface|null * The Messenger service. */ - public function getMessenger() { + protected function getMessenger() { // Use the Messenger service, if it exists. if (\Drupal::hasService('messenger')) { // Note: because the container has the potential to be rebuilt during diff --git a/core/lib/Drupal/Core/Messenger/MessengerInterface.php b/core/lib/Drupal/Core/Messenger/MessengerInterface.php index 441ea6fc22..0d5e63ac95 100644 --- a/core/lib/Drupal/Core/Messenger/MessengerInterface.php +++ b/core/lib/Drupal/Core/Messenger/MessengerInterface.php @@ -127,7 +127,7 @@ public function deleteAll(); * self::TYPE_ERROR. * * @return string[]|\Drupal\Component\Render\MarkupInterface[] - * The deleted messages of given type.. + * The deleted messages of given type. */ public function deleteByType($type); diff --git a/core/tests/Drupal/KernelTests/Core/Messenger/LegacyMessengerTest.php b/core/tests/Drupal/KernelTests/Core/Messenger/LegacyMessengerTest.php index 168098cc9a..1a64f7f019 100644 --- a/core/tests/Drupal/KernelTests/Core/Messenger/LegacyMessengerTest.php +++ b/core/tests/Drupal/KernelTests/Core/Messenger/LegacyMessengerTest.php @@ -2,6 +2,7 @@ namespace Drupal\KernelTests\Core\Messenger; +use Drupal\Core\Messenger\LegacyMessenger; use Drupal\Core\Messenger\Messenger; use Drupal\Core\Messenger\MessengerInterface; use Drupal\KernelTests\KernelTestBase; @@ -31,7 +32,12 @@ public function testMessages() { /** @var \Drupal\Core\Messenger\LegacyMessenger $messenger */ // Verify that the Messenger service doesn't exists. $messenger = \Drupal::messenger(); - $this->assertNull($messenger->getMessenger()); + + $reflection = new \ReflectionClass(LegacyMessenger::class); + $getMessenger = $reflection->getMethod('getMessenger'); + $getMessenger->setAccessible(TRUE); + + $this->assertNull($getMessenger->invoke($messenger)); // Add messages. $messenger->addMessage('Foobar'); @@ -47,7 +53,7 @@ public function testMessages() { // Verify that the Messenger service exists. $messenger = \Drupal::messenger(); - $this->assertInstanceOf(Messenger::class, $messenger->getMessenger()); + $this->assertInstanceOf(Messenger::class, $getMessenger->invoke($messenger)); // Add more messages. $messenger->addMessage('Platypus');