From 09e9bcb3d07f1aaec70150a3ac7d3c7aad52f700 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Sun, 1 May 2016 07:28:46 +0200
Subject: [PATCH 1/2] Always load dotenv, even if config is cached

---
 .../Foundation/Bootstrap/DetectEnvironment.php       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php
index 03914738d960..2468936e9b33 100644
--- a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php
+++ b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php
@@ -16,14 +16,12 @@ class DetectEnvironment
      */
     public function bootstrap(Application $app)
     {
-        if (! $app->configurationIsCached()) {
-            $this->checkForSpecificEnvironmentFile($app);
+        $this->checkForSpecificEnvironmentFile($app);
 
-            try {
-                (new Dotenv($app->environmentPath(), $app->environmentFile()))->load();
-            } catch (InvalidPathException $e) {
-                //
-            }
+        try {
+            (new Dotenv($app->environmentPath(), $app->environmentFile()))->load();
+        } catch (InvalidPathException $e) {
+            //
         }
     }
 

From 7c85c7633b3618e6f7a970e2c7a25dd6b3bd9f71 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Sun, 1 May 2016 07:32:05 +0200
Subject: [PATCH 2/2] app->environment() instead of env(), to support --env in
 CLI

---
 .../Foundation/Bootstrap/DetectEnvironment.php         | 10 +++++-----
 .../Foundation/Bootstrap/LoadConfiguration.php         |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php
index 2468936e9b33..7ea3d6784030 100644
--- a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php
+++ b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php
@@ -16,6 +16,10 @@ class DetectEnvironment
      */
     public function bootstrap(Application $app)
     {
+        $app->detectEnvironment(function () use ($config) {
+            return env('APP_ENV', 'production');
+        });
+
         $this->checkForSpecificEnvironmentFile($app);
 
         try {
@@ -33,11 +37,7 @@ public function bootstrap(Application $app)
      */
     protected function checkForSpecificEnvironmentFile($app)
     {
-        if (! env('APP_ENV')) {
-            return;
-        }
-
-        $file = $app->environmentFile().'.'.env('APP_ENV');
+        $file = $app->environmentFile().'.'.$app->environment();
 
         if (file_exists($app->environmentPath().'/'.$file)) {
             $app->loadEnvironmentFrom($file);
diff --git a/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php b/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php
index eb4d07691470..9f1c7316341e 100644
--- a/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php
+++ b/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php
@@ -38,10 +38,6 @@ public function bootstrap(Application $app)
             $this->loadConfigurationFiles($app, $config);
         }
 
-        $app->detectEnvironment(function () use ($config) {
-            return $config->get('app.env', 'production');
-        });
-
         date_default_timezone_set($config['app.timezone']);
 
         mb_internal_encoding('UTF-8');