Merge pull request laravel#8349 from lucasmichot/5.0-messagebag

taylorotwell · taylorotwell · commit 79d5e2116885 · 2015-04-09T07:46:24.000-05:00
[5.0] MessageBag : variables set only if and when necessary
diff --git a/src/Illuminate/Support/MessageBag.php b/src/Illuminate/Support/MessageBag.php
@@ -130,14 +130,12 @@ public function first($key = null, $format = null)
 	 */
 	public function get($key, $format = null)
 	{
-		$format = $this->checkFormat($format);
-
 		// If the message exists in the container, we will transform it and return
 		// the message. Otherwise, we'll return an empty array since the entire
 		// methods is to return back an array of messages in the first place.
 		if (array_key_exists($key, $this->messages))
 		{
-			return $this->transform($this->messages[$key], $format, $key);
+			return $this->transform($this->messages[$key], $this->checkFormat($format), $key);
 		}
 
 		return array();
@@ -178,10 +176,10 @@ protected function transform($messages, $format, $messageKey)
 		// We will simply spin through the given messages and transform each one
 		// replacing the :message place holder with the real message allowing
 		// the messages to be easily formatted to each developer's desires.
+		$replace = array(':message', ':key');
+
 		foreach ($messages as &$message)
 		{
-			$replace = array(':message', ':key');
-
 			$message = str_replace($replace, array($message, $messageKey), $format);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -130,14 +130,12 @@ public function first($key = null, $format = null)`
`130`	`130`	`*/`
`131`	`131`	`public function get($key, $format = null)`
`132`	`132`	`{`
`133`		`- $format = $this->checkFormat($format);`
`134`		`-`
`135`	`133`	`// If the message exists in the container, we will transform it and return`
`136`	`134`	`// the message. Otherwise, we'll return an empty array since the entire`
`137`	`135`	`// methods is to return back an array of messages in the first place.`
`138`	`136`	`if (array_key_exists($key, $this->messages))`
`139`	`137`	`{`
`140`		`- return $this->transform($this->messages[$key], $format, $key);`
	`138`	`+ return $this->transform($this->messages[$key], $this->checkFormat($format), $key);`
`141`	`139`	`}`
`142`	`140`
`143`	`141`	`return array();`
`@@ -178,10 +176,10 @@ protected function transform($messages, $format, $messageKey)`
`178`	`176`	`// We will simply spin through the given messages and transform each one`
`179`	`177`	`// replacing the :message place holder with the real message allowing`
`180`	`178`	`// the messages to be easily formatted to each developer's desires.`
	`179`	`+ $replace = array(':message', ':key');`
	`180`	`+`
`181`	`181`	`foreach ($messages as &$message)`
`182`	`182`	`{`
`183`		`- $replace = array(':message', ':key');`
`184`		`-`
`185`	`183`	`$message = str_replace($replace, array($message, $messageKey), $format);`
`186`	`184`	`}`
`187`	`185`