From 5d52da696fb7202bd131948d52781d7b759edc53 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Fri, 13 Apr 2012 20:34:13 -0500
Subject: [PATCH] use injection on the request::detect_env method for better
 testability.

---
 laravel/core.php    | 4 +++-
 laravel/request.php | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/laravel/core.php b/laravel/core.php
index 2474619b..dae6ee60 100644
--- a/laravel/core.php
+++ b/laravel/core.php
@@ -168,7 +168,9 @@
 }
 else
 {
-	$environment = Request::detect_env($environments);
+	$root = Request::foundation()->getRootUrl();
+
+	$environment = Request::detect_env($environments, $root);
 }
 
 /*
diff --git a/laravel/request.php b/laravel/request.php
index 3985d27b..3dad614a 100644
--- a/laravel/request.php
+++ b/laravel/request.php
@@ -212,12 +212,11 @@ public static function is_env($env)
 	 * Detect the current environment from an environment configuration.
 	 *
 	 * @param  array        $environments
+	 * @param  string       $uri
 	 * @return string|null
 	 */
-	public static function detect_env(array $environments)
+	public static function detect_env(array $environments, $uri)
 	{
-		$root = static::foundation()->getRootUrl();
-
 		foreach ($environments as $environment => $patterns)
 		{
 			// Essentially we just want to loop through each environment pattern
@@ -225,7 +224,7 @@ public static function detect_env(array $environments)
 			// we'll simply return the environment for that URI pattern.
 			foreach ($patterns as $pattern)
 			{
-				if (Str::is($pattern, $root))
+				if (Str::is($pattern, $uri))
 				{
 					return $environment;
 				}