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

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

Browse Source 
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
-------

a27f9591f5 Let getFlashes starts the session
This commit is contained in:
Fabien Potencier 2017-11-21 18:06:30 +01:00
commit 72a204e2c3
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) public function getFlashes($types = null)
{ {
// needed to avoid starting the session automatically when looking for flash messages
try { try {
$session = $this->getSession(); $session = $this->getSession();
if (null === $session || !$session->isStarted()) { if (null === $session) {
return array(); return array();
} }
} catch (\RuntimeException $e) { } catch (\RuntimeException $e) {

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

@ -174,13 +174,8 @@ class AppVariableTest extends TestCase
*/ */
public function testGetFlashesWithNoSessionStarted() public function testGetFlashesWithNoSessionStarted()
{ {
$session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock(); $flashMessages = $this->setFlashMessages(false);
$request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock(); $this->assertEquals($flashMessages, $this->appVariable->getFlashes());
$request->method('getSession')->willReturn($session);
$this->setRequestStack($request);
$this->assertEquals(array(), $this->appVariable->getFlashes());
} }
/** /**
@ -258,7 +253,7 @@ class AppVariableTest extends TestCase
$token->method('getUser')->willReturn($user); $token->method('getUser')->willReturn($user);
} }
private function setFlashMessages() private function setFlashMessages($sessionHasStarted = true)
{ {
$flashMessages = array( $flashMessages = array(
'notice' => array('Notice #1 message'), 'notice' => array('Notice #1 message'),
@ -269,7 +264,7 @@ class AppVariableTest extends TestCase
$flashBag->initialize($flashMessages); $flashBag->initialize($flashMessages);
$session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock(); $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); $session->method('getFlashBag')->willReturn($flashBag);
$request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock(); $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();