Change flash session variable from Message to Flash

cakephp · Jun 11, 2014 · 795eb4d · 795eb4d
1 parent 455ce4a
commit 795eb4d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/Controller/Component/FlashComponent.php b/src/Controller/Component/FlashComponent.php
@@ -63,7 +63,7 @@ public function __construct(ComponentRegistry $collection, array $config = []) {
  *
  * ### Options:
  *
- * - `key` The key to set under the session's Message key
+ * - `key` The key to set under the session's Flash key
  * - `element` The element used to render the flash message
  * - `params` An array of variables to make available when using an element
  *
@@ -78,7 +78,7 @@ public function set($message, array $options = []) {
 			$message = $message->getMessage();
 		}
 
-		$this->_session->write("Message.{$opts['key']}", [
+		$this->_session->write("Flash.{$opts['key']}", [
 			'message' => $message,
 			'key' => $opts['key'],
 			'element' => $opts['element'],

diff --git a/src/View/Helper/FlashHelper.php b/src/View/Helper/FlashHelper.php
@@ -58,14 +58,14 @@ class FlashHelper extends Helper {
  * ]);
  * }}}
  *
- * @param string $key The [Message.]key you are rendering in the view.
+ * @param string $key The [Flash.]key you are rendering in the view.
  * @param array $options Additional options to use for the creation of this flash message.
  *    Supports the 'params', and 'element' keys that are used in the helper.
  * @return string
  */
 	public function render($key = 'flash', array $options = []) {
-		$flash = $this->request->session()->read("Message.$key");
-		$this->request->session()->delete("Message.$key");
+		$flash = $this->request->session()->read("Flash.$key");
+		$this->request->session()->delete("Flash.$key");
 
 		if (!$flash) {
 			return '';

diff --git a/tests/TestCase/Controller/Component/FlashComponentTest.php b/tests/TestCase/Controller/Component/FlashComponentTest.php
@@ -60,7 +60,7 @@ public function tearDown() {
  * @covers \Cake\Controller\Component\FlashComponent::set
  */
 	public function testSet() {
-		$this->assertNull($this->Session->read('Message.flash'));
+		$this->assertNull($this->Session->read('Flash.flash'));
 
 		$this->Flash->set('This is a test message');
 		$expected = [
@@ -69,7 +69,7 @@ public function testSet() {
 			'element' => null,
 			'params' => []
 		];
-		$result = $this->Session->read('Message.flash');
+		$result = $this->Session->read('Flash.flash');
 		$this->assertEquals($expected, $result);
 
 		$this->Flash->set('This is a test message', ['element' => 'test', 'params' => ['foo' => 'bar']]);
@@ -79,7 +79,7 @@ public function testSet() {
 			'element' => 'test',
 			'params' => ['foo' => 'bar']
 		];
-		$result = $this->Session->read('Message.flash');
+		$result = $this->Session->read('Flash.flash');
 		$this->assertEquals($expected, $result);
 
 		$this->Flash->set('This is a test message', ['element' => 'MyPlugin.alert']);
@@ -89,7 +89,7 @@ public function testSet() {
 			'element' => 'MyPlugin.alert',
 			'params' => []
 		];
-		$result = $this->Session->read('Message.flash');
+		$result = $this->Session->read('Flash.flash');
 		$this->assertEquals($expected, $result);
 
 		$this->Flash->set('This is a test message', ['key' => 'foobar']);
@@ -99,7 +99,7 @@ public function testSet() {
 			'element' => null,
 			'params' => []
 		];
-		$result = $this->Session->read('Message.foobar');
+		$result = $this->Session->read('Flash.foobar');
 		$this->assertEquals($expected, $result);
 	}
 
@@ -110,7 +110,7 @@ public function testSet() {
  * @covers \Cake\Controller\Component\FlashComponent::set
  */
 	public function testSetWithException() {
-		$this->assertNull($this->Session->read('Message.flash'));
+		$this->assertNull($this->Session->read('Flash.flash'));
 
 		$this->Flash->set(new \Exception('This is a test message'));
 		$expected = [
@@ -119,7 +119,7 @@ public function testSetWithException() {
 			'element' => null,
 			'params' => []
 		];
-		$result = $this->Session->read('Message.flash');
+		$result = $this->Session->read('Flash.flash');
 		$this->assertEquals($expected, $result);
 	}
 }
diff --git a/tests/TestCase/View/Helper/FlashHelperTest.php b/tests/TestCase/View/Helper/FlashHelperTest.php
@@ -42,7 +42,7 @@ public function setUp() {
 		$this->Flash = new FlashHelper($this->View);
 
 		$session->write(array(
-			'Message' => array(
+			'Flash' => array(
 				'flash' => array(
 					'key' => 'flash',
 					'message' => 'This is a calling',