bug #25077 [Bridge/Twig] Let getFlashes starts the session (MatTheCat)

fabpot · fabpot · commit 72a204e2c3a6 · 2017-11-21T18:06:30.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Bridge/Twig] Let getFlashes starts the session | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? |no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25073 | License | MIT Commits ------- a27f959 Let getFlashes starts the session
diff --git a/src/Symfony/Bridge/Twig/AppVariable.php b/src/Symfony/Bridge/Twig/AppVariable.php
@@ -156,10 +156,9 @@ public function getDebug()
      */
     public function getFlashes($types = null)
     {
-        // needed to avoid starting the session automatically when looking for flash messages
         try {
             $session = $this->getSession();
-            if (null === $session || !$session->isStarted()) {
+            if (null === $session) {
                 return array();
             }
         } catch (\RuntimeException $e) {
diff --git a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
@@ -174,13 +174,8 @@ public function testGetFlashesWithNoRequest()
      */
     public function testGetFlashesWithNoSessionStarted()
     {
-        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
-        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
-        $request->method('getSession')->willReturn($session);
-
-        $this->setRequestStack($request);
-
-        $this->assertEquals(array(), $this->appVariable->getFlashes());
+        $flashMessages = $this->setFlashMessages(false);
+        $this->assertEquals($flashMessages, $this->appVariable->getFlashes());
     }
 
     /**
@@ -258,7 +253,7 @@ protected function setTokenStorage($user)
         $token->method('getUser')->willReturn($user);
     }
 
-    private function setFlashMessages()
+    private function setFlashMessages($sessionHasStarted = true)
     {
         $flashMessages = array(
             'notice' => array('Notice #1 message'),
@@ -269,7 +264,7 @@ private function setFlashMessages()
         $flashBag->initialize($flashMessages);
 
         $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
-        $session->method('isStarted')->willReturn(true);
+        $session->method('isStarted')->willReturn($sessionHasStarted);
         $session->method('getFlashBag')->willReturn($flashBag);
 
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();

Original file line number	Diff line number	Diff line change
`@@ -156,10 +156,9 @@ public function getDebug()`
`156`	`156`	`*/`
`157`	`157`	`public function getFlashes($types = null)`
`158`	`158`	`{`
`159`		`- // needed to avoid starting the session automatically when looking for flash messages`
`160`	`159`	`try {`
`161`	`160`	`$session = $this->getSession();`
`162`		`- if (null === $session \|\| !$session->isStarted()) {`
	`161`	`+ if (null === $session) {`
`163`	`162`	`return array();`
`164`	`163`	`}`
`165`	`164`	`} catch (\RuntimeException $e) {`