symfony
diff --git a/‎src/Symfony/Bridge/Twig/AppVariable.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/AppVariable.php
+31Lines changed: 31 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/AppVariable.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/AppVariable.php
+31Lines changed: 31 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
+78Lines changed: 78 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
+78Lines changed: 78 additions & 0 deletions
@@ -145,4 +145,35 @@ public function getDebug()
 
         return $this->debug;
     }
+
+    /**
+     * Returns some or all the existing flash messages:
+     *  * getFlashes() returns all the flash messages
+     *  * getFlashes('notice') returns a simple array with flash messages of that type
+     *  * getFlashes(array('notice', 'error')) returns a nested array of type => messages.
+     *
+     * @return array
+     */
+    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()) {
+                return array();
+            }
+        } catch (\RuntimeException $e) {
+            return array();
+        }
+
+        if (null === $types || '' === $types || array() === $types) {
+            return $session->getFlashBag()->all();
+        }
+
+        if (is_string($types)) {
+            return $session->getFlashBag()->get($types);
+        }
+
+        return array_intersect_key($session->getFlashBag()->all(), array_flip($types));
+    }
 }
@@ -5,6 +5,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Twig\AppVariable;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
 use Symfony\Component\HttpFoundation\Session\Session;
 
 class AppVariableTest extends TestCase
@@ -157,6 +158,62 @@ public function testGetSessionWithRequestStackNotSet()
         $this->appVariable->getSession();
     }
 
+    public function testGetFlashesWithNoRequest()
+    {
+        $this->setRequestStack(null);
+
+        $this->assertEquals(array(), $this->appVariable->getFlashes());
+    }
+
+    public function testGetFlashesWithNoSessionStarted()
+    {
+        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
+        $request->method('getSession')->willReturn(new Session());
+
+        $this->setRequestStack($request);
+
+        $this->assertEquals(array(), $this->appVariable->getFlashes());
+    }
+
+    public function testGetFlashes()
+    {
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals($flashMessages, $this->appVariable->getFlashes(null));
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals($flashMessages, $this->appVariable->getFlashes(''));
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals($flashMessages, $this->appVariable->getFlashes(array()));
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals(array(), $this->appVariable->getFlashes('this-does-not-exist'));
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals(array(), $this->appVariable->getFlashes(array('this-does-not-exist')));
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals($flashMessages['notice'], $this->appVariable->getFlashes('notice'));
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals(
+            array('notice' => $flashMessages['notice']),
+            $this->appVariable->getFlashes(array('notice'))
+        );
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals(
+            array('notice' => $flashMessages['notice']),
+            $this->appVariable->getFlashes(array('notice', 'this-does-not-exist'))
+        );
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals(
+            array('notice' => $flashMessages['notice'], 'error' => $flashMessages['error']),
+            $this->appVariable->getFlashes(array('notice', 'error'))
+        );
+    }
+
     protected function setRequestStack($request)
     {
         $requestStackMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
@@ -175,4 +232,25 @@ protected function setTokenStorage($user)
 
         $token->method('getUser')->willReturn($user);
     }
+
+    private function setFlashMessages()
+    {
+        $flashMessages = array(
+            'notice' => array('Notice #1 message'),
+            'warning' => array('Warning #1 message'),
+            'error' => array('Error #1 message', 'Error #2 message'),
+        );
+        $flashBag = new FlashBag();
+        $flashBag->initialize($flashMessages);
+
+        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->getMock();
+        $session->method('isStarted')->willReturn(true);
+        $session->method('getFlashBag')->willReturn($flashBag);
+
+        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
+        $request->method('getSession')->willReturn($session);
+        $this->setRequestStack($request);
+
+        return $flashMessages;
+    }
 }