|
@@ -171,9 +171,9 @@ Request::$foundation = RequestFoundation::createFromGlobals();
|
|
|
|
|
|
if (Request::cli())
|
|
if (Request::cli())
|
|
{
|
|
{
|
|
- $environment = get_cli_option('env');
|
|
|
|
|
|
+ $environment = get_cli_option('env', getenv('LARAVEL_ENV'));
|
|
|
|
|
|
- if ( ! isset($environment))
|
|
|
|
|
|
+ if (empty($environment))
|
|
{
|
|
{
|
|
$environment = Request::detect_env($environments, gethostname());
|
|
$environment = Request::detect_env($environments, gethostname());
|
|
}
|
|
}
|
|
@@ -240,4 +240,4 @@ $bundles = require path('app').'bundles'.EXT;
|
|
foreach ($bundles as $bundle => $config)
|
|
foreach ($bundles as $bundle => $config)
|
|
{
|
|
{
|
|
Bundle::register($bundle, $config);
|
|
Bundle::register($bundle, $config);
|
|
-}
|
|
|
|
|
|
+}
|