bug #25182 [HttpFoundation] AutExpireFlashBag should not clear new flashes (Simperfit, sroze)

fabpot · fabpot · commit e2c608ae6b9f · 2017-11-28T17:55:34.000-08:00
This PR was merged into the 2.7 branch. Discussion ---------- [HttpFoundation] AutExpireFlashBag should not clear new flashes | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | #9318 | License | MIT | Doc PR | none I feel like very happy ! :) But don't worry I'm. ![img_2826](https://user-images.githubusercontent.com/3451634/33304006-99d44f38-d406-11e7-93f2-4dbc19891299.jpg) Commits ------- 706201e Test that it do not remove the new flashes when displaying the existing ones 7fe3fe8 [HttpFoundation] AutExpireFlashBag should not clear new flashes
diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
@@ -106,7 +106,7 @@ public function get($type, array $default = array())
     public function all()
     {
         $return = $this->flashes['display'];
-        $this->flashes = array('new' => array(), 'display' => array());
+        $this->flashes['display'] = array();
 
         return $return;
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php
@@ -150,4 +150,12 @@ public function testClear()
     {
         $this->assertEquals(array('notice' => array('A previous flash message')), $this->bag->clear());
     }
+
+    public function testDoNotRemoveTheNewFlashesWhenDisplayingTheExistingOnes()
+    {
+        $this->bag->add('success', 'Something');
+        $this->bag->all();
+
+        $this->assertEquals(array('new' => array('success' => array('Something')), 'display' => array()), $this->array);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function get($type, array $default = array())`
`106`	`106`	`public function all()`
`107`	`107`	`{`
`108`	`108`	`$return = $this->flashes['display'];`
`109`		`- $this->flashes = array('new' => array(), 'display' => array());`
	`109`	`+ $this->flashes['display'] = array();`
`110`	`110`
`111`	`111`	`return $return;`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,4 +150,12 @@ public function testClear()`
`150`	`150`	`{`
`151`	`151`	`$this->assertEquals(array('notice' => array('A previous flash message')), $this->bag->clear());`
`152`	`152`	`}`
	`153`	`+`
	`154`	`+ public function testDoNotRemoveTheNewFlashesWhenDisplayingTheExistingOnes()`
	`155`	`+ {`
	`156`	`+ $this->bag->add('success', 'Something');`
	`157`	`+ $this->bag->all();`
	`158`	`+`
	`159`	`+ $this->assertEquals(array('new' => array('success' => array('Something')), 'display' => array()), $this->array);`
	`160`	`+ }`
`153`	`161`	`}`