laravel
diff --git a/‎application/views/home/index.blade.php
Lines changed: 2 additions & 2 deletions b/‎application/views/home/index.blade.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎laravel/core.php
Lines changed: 8 additions & 4 deletions b/‎laravel/core.php
Lines changed: 8 additions & 4 deletions
diff --git a/‎laravel/database/eloquent/model.php
Lines changed: 5 additions & 5 deletions b/‎laravel/database/eloquent/model.php
Lines changed: 5 additions & 5 deletions
diff --git a/‎laravel/documentation/routing.md
Lines changed: 4 additions & 0 deletions b/‎laravel/documentation/routing.md
Lines changed: 4 additions & 0 deletions
diff --git a/‎laravel/response.php
Lines changed: 10 additions & 0 deletions b/‎laravel/response.php
Lines changed: 10 additions & 0 deletions
@@ -18,7 +18,7 @@
 		</header>
 		<div role="main" class="main">
 			<div class="home">
-				<h2>Learn the terrain.</h3>
+				<h2>Learn the terrain.</h2>
 
 				<p>
 					You've landed yourself on our default home page. The route that
@@ -34,7 +34,7 @@
 				<h2>Grow in knowledge.</h2>
 
 				<p>
-					Leaning to use Laravel is amazingly simple thanks to
+					Learning to use Laravel is amazingly simple thanks to
 					its {{ HTML::link('docs', 'wonderful documentation') }}.
 				</p>
 
 
@@ -148,15 +148,19 @@
 |--------------------------------------------------------------------------
 |
 | Next we're ready to determine the application environment. This may be
-| set either via the command line options, or, if the request is from
-| the web, via the mapping of URIs to environments that lives in
-| the "paths.php" file for the application and is parsed.
+| set either via the command line options or via the mapping of URIs to
+| environments that lives in the "paths.php" file for the application and
+| is parsed. When determining the CLI environment, the "--env" CLI option
+| overrides the mapping in "paths.php".
 |
 */
-
 if (Request::cli())
 {
 	$environment = get_cli_option('env');
+
+	if (! isset($environment)) {
+		$environment = Request::detect_env($environments, gethostname());
+	}
 }
 else
 {
 
@@ -230,11 +230,9 @@ public static function update($id, $attributes)
 	 * @param  array   $columns
 	 * @return Model
 	 */
-	public static function find($id, $columns = array('*'))
+	public function _find($id, $columns = array('*'))
 	{
-		$model = new static;
-
-		return $model->query()->where(static::$key, '=', $id)->first($columns);
+		return $this->query()->where(static::$key, '=', $id)->first($columns);
 	}
 
 	/**
@@ -746,10 +744,12 @@ public function __call($method, $parameters)
 			return static::$$method;
 		}
 
+		$underscored = array('with', 'find');
+
 		// Some methods need to be accessed both staticly and non-staticly so we'll
 		// keep underscored methods of those methods and intercept calls to them
 		// here so they can be called either way on the model instance.
-		if (in_array($method, array('with')))
+		if (in_array($method, $underscored))
 		{
 			return call_user_func_array(array($this, '_'.$method), $parameters);
 		}
 
@@ -307,6 +307,10 @@ This routing convention may not be desirable for every situation, so you may als
 
 	Route::get('welcome', array('after' => 'log', 'uses' => 'home@index'));
 
+#### Registering a named route that points to a controller action:
+
+	Route::get('welcome', array('as' => 'home.welcome', 'uses' => 'home@index'));
+
 <a name="cli-route-testing"></a>
 ## CLI Route Testing
 
 
@@ -334,4 +334,14 @@ public function status($status = null)
 		}
 	}
 
+	/**
+	 * Render the response when cast to string
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->render();
+	}
+
 }
Original file line number	Diff line number	Diff line change
`@@ -148,15 +148,19 @@`
`148`	`148`	`\|--------------------------------------------------------------------------`
`149`	`149`	`\|`
`150`	`150`	`\| Next we're ready to determine the application environment. This may be`
`151`		`-\| set either via the command line options, or, if the request is from`
`152`		`-\| the web, via the mapping of URIs to environments that lives in`
`153`		`-\| the "paths.php" file for the application and is parsed.`
	`151`	`+\| set either via the command line options or via the mapping of URIs to`
	`152`	`+\| environments that lives in the "paths.php" file for the application and`
	`153`	`+\| is parsed. When determining the CLI environment, the "--env" CLI option`
	`154`	`+\| overrides the mapping in "paths.php".`
`154`	`155`	`\|`
`155`	`156`	`*/`
`156`		`-`
`157`	`157`	`if (Request::cli())`
`158`	`158`	`{`
`159`	`159`	`$environment = get_cli_option('env');`
	`160`	`+`
	`161`	`+ if (! isset($environment)) {`
	`162`	`+ $environment = Request::detect_env($environments, gethostname());`
	`163`	`+ }`
`160`	`164`	`}`
`161`	`165`	`else`
`162`	`166`	`{`
Original file line number	Diff line number	Diff line change
`@@ -230,11 +230,9 @@ public static function update($id, $attributes)`
`230`	`230`	`* @param array $columns`
`231`	`231`	`* @return Model`
`232`	`232`	`*/`
`233`		`- public static function find($id, $columns = array('*'))`
	`233`	`+ public function _find($id, $columns = array('*'))`
`234`	`234`	`{`
`235`		`- $model = new static;`
`236`		`-`
`237`		`- return $model->query()->where(static::$key, '=', $id)->first($columns);`
	`235`	`+ return $this->query()->where(static::$key, '=', $id)->first($columns);`
`238`	`236`	`}`
`239`	`237`
`240`	`238`	`/**`
`@@ -746,10 +744,12 @@ public function __call($method, $parameters)`
`746`	`744`	`return static::$$method;`
`747`	`745`	`}`
`748`	`746`
	`747`	`+ $underscored = array('with', 'find');`
	`748`	`+`
`749`	`749`	`// Some methods need to be accessed both staticly and non-staticly so we'll`
`750`	`750`	`// keep underscored methods of those methods and intercept calls to them`
`751`	`751`	`// here so they can be called either way on the model instance.`
`752`		`- if (in_array($method, array('with')))`
	`752`	`+ if (in_array($method, $underscored))`
`753`	`753`	`{`
`754`	`754`	`return call_user_func_array(array($this, '_'.$method), $parameters);`
`755`	`755`	`}`
Original file line number	Diff line number	Diff line change
`@@ -334,4 +334,14 @@ public function status($status = null)`
`334`	`334`	`}`
`335`	`335`	`}`
`336`	`336`
	`337`	`+ /**`
	`338`	`+ * Render the response when cast to string`
	`339`	`+ *`
	`340`	`+ * @return string`
	`341`	`+ */`
	`342`	`+ public function __toString()`
	`343`	`+ {`
	`344`	`+ return $this->render();`
	`345`	`+ }`
	`346`	`+`
`337`	`347`	`}`