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

refactoring various classes.

Browse Source
This commit is contained in:
Taylor Otwell
2011-11-22 18:00:17 -06:00
parent 246434f4c7
commit 5f348b2c6e
14 changed files with 373 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
laravel/messages.php
View File

@@ -24,6 +24,11 @@ class Messages {
/**
* Add a message to the collector.
*
* <code>
* // Add a message for the e-mail attribute
* $messages->add('email', 'The e-mail address is invalid.');
* </code>
*
* @param string $key
* @param string $message
* @return void
@@ -42,7 +47,7 @@ class Messages {
*/
protected function unique($key, $message)
{
return ! isset($this->messages[$key]) or array_search($message, $this->messages[$key]) === false;
return ! isset($this->messages[$key]) or ! in_array($message, $this->messages[$key]);
}
/**
@@ -91,10 +96,8 @@ class Messages {
* @param string $format
* @return array
*/
public function get($key = null, $format = ':message')
public function get($key, $format = ':message')
{
if (is_null($key)) return $this->all($format);
if (array_key_exists($key, $this->messages))
{
return $this->format($this->messages[$key], $format);