From 5f97030ce8a7b3490c77f820d30ab4434a937795 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 30 May 2012 08:41:03 -0500 Subject: [PATCH] refactored set_format to foromat. --- laravel/messages.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/laravel/messages.php b/laravel/messages.php index 16b4fa37..bf5d61c3 100644 --- a/laravel/messages.php +++ b/laravel/messages.php @@ -80,12 +80,12 @@ public function has($key = null) * * * // Apply a new default format. - * $messages->set_format('email', '

this is my :message

'); + * $messages->format('email', '

this is my :message

'); *
* * @param string $format */ - public function set_format($format = ':message') + public function format($format = ':message') { $this->format = $format; } @@ -111,6 +111,7 @@ public function set_format($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] : ''; @@ -134,9 +135,10 @@ public function first($key = null, $format = null) 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); + return $this->transform($this->messages[$key], $format); } return array(); @@ -159,11 +161,12 @@ public function get($key, $format = null) public function all($format = null) { $format = ($format === null) ? $this->format : $format; + $all = array(); foreach ($this->messages as $messages) { - $all = array_merge($all, $this->format($messages, $format)); + $all = array_merge($all, $this->transform($messages, $format)); } return $all; @@ -176,7 +179,7 @@ public function all($format = null) * @param string $format * @return array */ - protected function format($messages, $format) + protected function transform($messages, $format) { $messages = (array) $messages;