adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for stacking Flash messages

Browse source 
See Issue #7830
This commit is contained in:
xhs345 2016-10-27 14:39:21 -07:00
parent 135a24e0f1
commit c59fb85da8
3 changed files with 52 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Cake/Controller/Component/FlashComponent.php
View file

@ -82,12 +82,18 @@ class FlashComponent extends Component {
}
$options['element'] = $plugin . 'Flash/' . $element;
CakeSession::write('Message.' . $options['key'], array(
$messages = CakeSession::read('Message.' . $options['key']);
$newMessage = array(
'message' => $message,
'key' => $options['key'],
'element' => $options['element'],
'params' => $options['params']
));
);
$messages[] = $newMessage;
CakeSession::write('Message.' . $options['key'], $messages);
}
/**

60
lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php
View file

@ -59,10 +59,12 @@ class FlashComponentTest extends CakeTestCase {
$this->Flash->set('This is a test message');
$expected = array(
'message' => 'This is a test message',
'key' => 'flash',
'element' => 'Flash/default',
'params' => array()
array(
'message' => 'This is a test message',
'key' => 'flash',
'element' => 'Flash/default',
'params' => array()
)
);
$result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result);
@ -72,30 +74,36 @@ class FlashComponentTest extends CakeTestCase {
'params' => array('foo' => 'bar')
));
$expected = array(
'message' => 'This is a test message',
'key' => 'flash',
'element' => 'Flash/test',
'params' => array('foo' => 'bar')
array(
'message' => 'This is a test message',
'key' => 'flash',
'element' => 'Flash/test',
'params' => array('foo' => 'bar')
)
);
$result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result);
$this->Flash->set('This is a test message', array('element' => 'MyPlugin.alert'));
$expected = array(
'message' => 'This is a test message',
'key' => 'flash',
'element' => 'MyPlugin.Flash/alert',
'params' => array()
array(
'message' => 'This is a test message',
'key' => 'flash',
'element' => 'MyPlugin.Flash/alert',
'params' => array()
)
);
$result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result);
$this->Flash->set('This is a test message', array('key' => 'foobar'));
$expected = array(
'message' => 'This is a test message',
'key' => 'foobar',
'element' => 'Flash/default',
'params' => array()
array(
'message' => 'This is a test message',
'key' => 'foobar',
'element' => 'Flash/default',
'params' => array()
)
);
$result = CakeSession::read('Message.foobar');
$this->assertEquals($expected, $result);
@ -111,10 +119,12 @@ class FlashComponentTest extends CakeTestCase {
$this->Flash->set(new Exception('This is a test message', 404));
$expected = array(
'message' => 'This is a test message',
'key' => 'flash',
'element' => 'Flash/default',
'params' => array('code' => 404)
array(
'message' => 'This is a test message',
'key' => 'flash',
'element' => 'Flash/default',
'params' => array('code' => 404)
)
);
$result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result);
@ -131,10 +141,12 @@ class FlashComponentTest extends CakeTestCase {
$FlashWithSettings = $this->Components->load('Flash', array('element' => 'test'));
$FlashWithSettings->set('This is a test message');
$expected = array(
'message' => 'This is a test message',
'key' => 'flash',
'element' => 'Flash/test',
'params' => array()
array(
'message' => 'This is a test message',
'key' => 'flash',
'element' => 'Flash/test',
'params' => array()
)
);
$result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result);

11
lib/Cake/View/Helper/FlashHelper.php
View file

@ -82,10 +82,15 @@ class FlashHelper extends AppHelper {
));
}
$flash = $options + $flash;
CakeSession::delete("Message.$key");
$flash['key'] = $key;
return $this->_View->element($flash['element'], $flash);
$out = '';
foreach ($flash as $message) {
$message['key'] = $key;
$message = $options + $message;
$out .= $this->_View->element($message['element'], $message);
}
return $out;
}
}