diff --git a/core/core.services.yml b/core/core.services.yml index a42d9d1..188fc1e 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -1612,4 +1612,4 @@ services: - { name: event_subscriber } messenger: class: Drupal\Core\Messenger\SessionMessenger - arguments: ['@session_manager', '@page_cache_kill_switch'] + arguments: ['@page_cache_kill_switch'] diff --git a/core/lib/Drupal/Core/Messenger/SessionMessenger.php b/core/lib/Drupal/Core/Messenger/SessionMessenger.php index 570df10..ed73152 100644 --- a/core/lib/Drupal/Core/Messenger/SessionMessenger.php +++ b/core/lib/Drupal/Core/Messenger/SessionMessenger.php @@ -5,7 +5,6 @@ use Drupal\Component\Render\MarkupInterface; use Drupal\Core\PageCache\ResponsePolicy\KillSwitch; use Drupal\Core\Render\Markup; -use Drupal\Core\Session\SessionManagerInterface; /** * Provides a session-based messenger. @@ -20,22 +19,14 @@ class SessionMessenger implements MessengerInterface { protected $pageCacheKillSwitch; /** - * The session manager. - * - * @var \Drupal\Core\Session\SessionManagerInterface - */ - protected $sessionManager; - - /** * Constructs a new instance. * * @param \Drupal\Core\Session\SessionManagerInterface * @param \Drupal\Core\PageCache\ResponsePolicy\KillSwitch $page_cache_kill_switch * The page caching kill switch. */ - public function __construct(SessionManagerInterface $session_manager, KillSwitch $page_cache_kill_switch) { + public function __construct(KillSwitch $page_cache_kill_switch) { $this->pageCacheKillSwitch = $page_cache_kill_switch; - $this->sessionManager = $session_manager; } /** diff --git a/core/tests/Drupal/Tests/Core/Messenger/SessionMessengerTest.php b/core/tests/Drupal/Tests/Core/Messenger/SessionMessengerTest.php index 951ff10..2da979c 100644 --- a/core/tests/Drupal/Tests/Core/Messenger/SessionMessengerTest.php +++ b/core/tests/Drupal/Tests/Core/Messenger/SessionMessengerTest.php @@ -4,7 +4,6 @@ use Drupal\Core\Messenger\SessionMessenger; use Drupal\Core\PageCache\ResponsePolicy\KillSwitch; -use Drupal\Core\Session\SessionManagerInterface; use Drupal\Tests\UnitTestCase; /** @@ -35,18 +34,10 @@ class SessionMessengerTest extends UnitTestCase { protected $pageCacheKillSwitch; /** - * The session manager. - * - * @var \Drupal\Core\Session\SessionManagerInterface|\PHPUnit_Framework_MockObject_MockObject - */ - protected $sessionManager; - - /** * {@inheritdoc} */ public function setUp() { $this->pageCacheKillSwitch = $this->prophesize(KillSwitch::class); - $this->sessionManager = $this->prophesize(SessionManagerInterface::class); $this->existingSession = isset($_SESSION) ? $_SESSION : NULL; $_SESSION = []; @@ -74,8 +65,7 @@ public function tearDown() { public function testMessenger() { $this->pageCacheKillSwitch->trigger()->shouldBeCalled(); - $this->sessionManager->start()->shouldBeCalled(); - $this->messenger = new SessionMessenger($this->sessionManager->reveal(), $this->pageCacheKillSwitch->reveal()); + $this->messenger = new SessionMessenger($this->pageCacheKillSwitch->reveal()); $message_a = $this->randomMachineName(); $type_a = $this->randomMachineName();