[Session] Fixed Backward Compatibility issue with getFlashes()

symfony · Apr 25, 2012 · 6756f28 · 6756f28
1 parent b7189fd
commit 6756f28
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php
@@ -256,7 +256,11 @@ public function getFlashes()
         $return = array();
         if ($all) {
             foreach ($all as $name => $array) {
-                $return[$name] = reset($array);
+                if (is_numeric(key($array))) {
+                    $return[$name] = reset($array);
+                } else {
+                    $return[$name] = $array;
+                }
             }
         }
 

diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php
@@ -183,6 +183,21 @@ public function testGetSetFlashes()
         $this->assertEquals(array('notice' => 'foo'), $this->session->getFlashes());
     }
 
+    public function testGetFlashesWithArray()
+    {
+        $array = array('notice' => 'hello', 'error' => 'none');
+        $this->assertEquals(array(), $this->session->getFlashes());
+        $this->session->setFlash('foo', $array);
+        $this->assertEquals(array('foo' => $array), $this->session->getFlashes());
+        $this->assertEquals(array(), $this->session->getFlashes());
+
+        $array = array('hello', 'foo');
+        $this->assertEquals(array(), $this->session->getFlashes());
+        $this->session->setFlash('foo', $array);
+        $this->assertEquals(array('foo' => 'hello'), $this->session->getFlashes());
+        $this->assertEquals(array(), $this->session->getFlashes());
+    }
+
     public function testGetSetFlash()
     {
         $this->assertNull($this->session->getFlash('notice'));