From b4c2c08a116305bac97970f83fcf977945bee0ea Mon Sep 17 00:00:00 2001
From: Christophe Graniczny <christophe.graniczny@gmail.com>
Date: Wed, 13 Jan 2016 08:20:54 +0000
Subject: [PATCH] Load custom environment file if available

---
 .../Foundation/Bootstrap/DetectEnvironment.php  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php
index 673ce3ab8a22..d3ceb6dfef2d 100644
--- a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php
+++ b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php
@@ -17,6 +17,8 @@ class DetectEnvironment
     public function bootstrap(Application $app)
     {
         if (! $app->configurationIsCached()) {
+            $this->detectCustomEnvFile($app);
+
             try {
                 (new Dotenv($app->environmentPath(), $app->environmentFile()))->load();
             } catch (InvalidPathException $e) {
@@ -24,4 +26,19 @@ public function bootstrap(Application $app)
             }
         }
     }
+
+    /**
+     * Detect if a custom env file matching the APP_ENV exists.
+     *
+     * @param  \Illuminate\Contracts\Foundation\Application  $app
+     * @return void
+     */
+    protected function detectCustomEnvFile($app)
+    {
+        $fileName = $app->environmentFile().'.'.env('APP_ENV');
+
+        if (file_exists($app->environmentPath().'/'.$fileName)) {
+            $app->loadEnvironmentFrom($fileName);
+        }
+    }
 }