diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let getFlashes starts the session

Browse Source
This commit is contained in:
Mathieu Lechat 2017-11-21 11:45:38 +01:00
parent 921a4a08fe
commit a27f9591f5
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bridge/Twig/AppVariable.php
View File

@ -156,10 +156,9 @@ class AppVariable
*/
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) {

13
src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
View File

@ -174,13 +174,8 @@ class AppVariableTest extends TestCase
*/
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 @@ class AppVariableTest extends TestCase
$token->method('getUser')->willReturn($user);
}
private function setFlashMessages()
private function setFlashMessages($sessionHasStarted = true)
{
$flashMessages = array(
'notice' => array('Notice #1 message'),
@ -269,7 +264,7 @@ class AppVariableTest extends TestCase
$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();