bug #27350 [HttpKernel] fix deprecation in AbstractTestSessionListener (alekitto)

nicolas-grekas · nicolas-grekas · commit 7d23ac529f13 · 2018-05-25T16:30:50.000+02:00
This PR was merged into the 4.1 branch. Discussion ---------- [HttpKernel] fix deprecation in AbstractTestSessionListener | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT After #26564 functional tests began to emit a deprecation warning because of `getSession()` being called without verifying the existence of a session. Commits ------- 0ecaefe [HttpKernel] fix deprecation in AbstractTestSessionListener
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
@@ -61,10 +61,12 @@ public function onKernelResponse(FilterResponseEvent $event)
             return;
         }
 
-        if (!$session = $event->getRequest()->getSession()) {
+        $request = $event->getRequest();
+        if (!$request->hasSession()) {
             return;
         }
 
+        $session = $request->getSession();
         if ($wasStarted = $session->isStarted()) {
             $session->save();
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
@@ -123,6 +123,16 @@ public function testDoesNotImplementServiceSubscriberInterface()
         $this->assertFalse(is_subclass_of(TestSessionListener::class, ServiceSubscriberInterface::class, 'Implementing ServiceSubscriberInterface would create a dep on the DI component, which eg Silex cannot afford'));
     }
 
+    public function testDoesNotThrowIfRequestDoesNotHaveASession()
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, new Response());
+
+        $this->listener->onKernelResponse($event);
+
+        $this->assertTrue(true);
+    }
+
     private function filterResponse(Request $request, $type = HttpKernelInterface::MASTER_REQUEST)
     {
         $request->setSession($this->session);

Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,12 @@ public function onKernelResponse(FilterResponseEvent $event)`
`61`	`61`	`return;`
`62`	`62`	`}`
`63`	`63`
`64`		`- if (!$session = $event->getRequest()->getSession()) {`
	`64`	`+ $request = $event->getRequest();`
	`65`	`+ if (!$request->hasSession()) {`
`65`	`66`	`return;`
`66`	`67`	`}`
`67`	`68`
	`69`	`+ $session = $request->getSession();`
`68`	`70`	`if ($wasStarted = $session->isStarted()) {`
`69`	`71`	`$session->save();`
`70`	`72`	`}`