ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #714 from daylerees/feature/error-format

Browse Source 
Allow custom global message format.
This commit is contained in:
Taylor Otwell
2012-05-30 06:38:27 -07:00
parent db6206218a 3f0adcb5f3
commit c2ad6a8126
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
laravel/messages.php
View File

@@ -9,6 +9,13 @@ class Messages {
*/
public $messages;
/**
* Default format for message output.
*
* @var string
*/
public $format = ':message';
/**
* Create a new Messages instance.
*
@@ -68,6 +75,21 @@ class Messages {
return $this->first($key) !== '';
}
/**
* Set the default message format for output.
*
* <code>
* // Apply a new default format.
* $messages->set_format('email', '<p>this is my :message</p>');
* </code>
*
* @param string $format
*/
public function set_format($format = ':message')
{
$this->format = $format;
}
/**
* Get the first message from the container for a given key.
*
@@ -86,8 +108,9 @@ class Messages {
* @param string $format
* @return string
*/
public function first($key = null, $format = ':message')
public function first($key = null, $format = null)
{
$format = ($format === null) ? $this->format : $format;
$messages = is_null($key) ? $this->all($format) : $this->get($key, $format);
return (count($messages) > 0) ? $messages[0] : '';
@@ -108,8 +131,9 @@ class Messages {
* @param string $format
* @return array
*/
public function get($key, $format = ':message')
public function get($key, $format = null)
{
$format = ($format === null) ? $this->format : $format;
if (array_key_exists($key, $this->messages))
{
return $this->format($this->messages[$key], $format);
@@ -132,8 +156,9 @@ class Messages {
* @param string $format
* @return array
*/
public function all($format = ':message')
public function all($format = null)
{
$format = ($format === null) ? $this->format : $format;
$all = array();
foreach ($this->messages as $messages)