diff --git a/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php
index aaf3be507facd..c466fb7c9ed2d 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php
@@ -40,7 +40,8 @@ protected function getSession()
if ($this->container->has('session_storage')
&& ($storage = $this->container->get('session_storage')) instanceof NativeSessionStorage
- && $this->container->get('request_stack')->getMasterRequest()->isSecure()
+ && ($masterRequest = $this->container->get('request_stack')->getMasterRequest())
+ && $masterRequest->isSecure()
) {
$storage->setOptions(['cookie_secure' => true]);
}
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
index 47ac75e8bcc17..f931f6dacdc4c 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
@@ -15,8 +15,10 @@
use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\DependencyInjection\ServiceLocator;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@@ -41,8 +43,16 @@ public function testSessionIsSet()
{
$session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
+ $requestStack = $this->getMockBuilder(RequestStack::class)->getMock();
+ $requestStack->expects($this->once())->method('getMasterRequest')->willReturn(null);
+
+ $sessionStorage = $this->getMockBuilder(NativeSessionStorage::class)->getMock();
+ $sessionStorage->expects($this->never())->method('setOptions')->with(['cookie_secure' => true]);
+
$container = new Container();
$container->set('session', $session);
+ $container->set('request_stack', $requestStack);
+ $container->set('session_storage', $sessionStorage);
$request = new Request();
$listener = new SessionListener($container);
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy