Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use injection on the request::detect_env method for better testability.

This commit is contained in:
Taylor Otwell 2012-04-13 20:34:13 -05:00
parent 44dbbe01da
commit 5d52da696f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
laravel/core.php
View File

@ -168,7 +168,9 @@
} }
else else
{ {
$environment = Request::detect_env($environments); $root = Request::foundation()->getRootUrl();
$environment = Request::detect_env($environments, $root);
} }
/* /*

7
laravel/request.php
View File

@ -212,12 +212,11 @@ public static function is_env($env)
* Detect the current environment from an environment configuration. * Detect the current environment from an environment configuration.
* *
* @param array $environments * @param array $environments
* @param string $uri
* @return string|null * @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) foreach ($environments as $environment => $patterns)
{ {
// Essentially we just want to loop through each environment pattern // 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. // we'll simply return the environment for that URI pattern.
foreach ($patterns as $pattern) foreach ($patterns as $pattern)
{ {
if (Str::is($pattern, $root)) if (Str::is($pattern, $uri))
{ {
return $environment; return $environment;
} }