Skip to content

[Bridge/Twig] Let getFlashes starts the session #25077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2017
Merged

[Bridge/Twig] Let getFlashes starts the session #25077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Symfony/Bridge/Twig/AppVariable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
13 changes: 4 additions & 9 deletions src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

/**
Expand Down Expand Up @@ -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'),
Expand All @@ -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();
Expand Down