refactoring and adding more dependency injection through ioc container.

laravel/response.php

@@ -1,6 +1,6 @@
 <?php namespace Laravel;
 
-class Response {
+class Response implements Renderable {
 
 	/**
 	 * The content of the response.
@@ -86,7 +86,7 @@ class Response {
 	public function __construct($content, $status = 200)
 	{
 		$this->content = $content;
-		$this->status = $status;		
+		$this->status = $status;
 	}	
 
 	/**
@@ -104,6 +104,15 @@ class Response {
 	/**
 	 * Factory for creating new error response instances.
 	 *
+	 * The response status code will be set using the specified code.
+	 *
+	 * Note: The specified error code should correspond to a view in your views/error directory.
+	 *
+	 * <code>
+	 *		// Return a 404 error response
+	 *		return Response::error('404');
+	 * </code>
+	 *
 	 * @param  int       $code
 	 * @param  array     $data
 	 * @return Response
@@ -121,11 +130,19 @@ class Response {
 	 */
 	public static function prepare($response)
 	{
-		if ($response instanceof Redirect) $response = $response->response;
-
 		return ( ! $response instanceof Response) ? new static($response) : $response;
 	}
 
+	/**
+	 * Get the evaluated string contents of the response.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		return ($this->content instanceof Renderable) ? $this->content->render() : (string) $this->content;
+	}
+
 	/**
 	 * Send the response to the browser.
 	 *
@@ -140,7 +157,7 @@ class Response {
 
 		if ( ! headers_sent()) $this->send_headers();
 
-		echo (string) $this->content;
+		echo $this->render();
 	}
 
 	/**
@@ -163,6 +180,11 @@ class Response {
 	/**
 	 * Add a header to the response.
 	 *
+	 * <code>
+	 *		// Add a "location" header to a response
+	 *		$response->header('Location', 'http://google.com');
+	 * </code>
+	 *
 	 * @param  string    $name
 	 * @param  string    $value
 	 * @return Response
@@ -173,22 +195,4 @@ class Response {
 		return $this;
 	}
 
-	/**
-	 * Determine if the response is a redirect.
-	 *
-	 * @return bool
-	 */
-	public function is_redirect()
-	{
-		return $this->status == 301 or $this->status == 302;
-	}
-
-	/**
-	 * Get the parsed content of the Response.
-	 */
-	public function __toString()
-	{
-		return (string) $this->content;
-	}
-
 }