From 1f0909b9ab280d4a2af15ea71ecaa25ab4b267a8 Mon Sep 17 00:00:00 2001 From: Sebastian Nowak Date: Thu, 28 Apr 2016 10:56:35 +0200 Subject: [PATCH 1/4] 5.2 fix environment setting --- src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php index 03914738d960..431ba454bb68 100644 --- a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php +++ b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php @@ -35,6 +35,10 @@ public function bootstrap(Application $app) */ protected function checkForSpecificEnvironmentFile($app) { + if($env = $app->detectEnvironment(function() {})) { + putenv('APP_ENV=' . $env); + } + if (! env('APP_ENV')) { return; } From a2ad058835c9528a26e900751d55a8de800555ed Mon Sep 17 00:00:00 2001 From: Sebastian Nowak Date: Thu, 28 Apr 2016 10:59:45 +0200 Subject: [PATCH 2/4] 5.2 fix code style --- src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php index 431ba454bb68..cdd5a31fdb90 100644 --- a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php +++ b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php @@ -35,8 +35,8 @@ public function bootstrap(Application $app) */ protected function checkForSpecificEnvironmentFile($app) { - if($env = $app->detectEnvironment(function() {})) { - putenv('APP_ENV=' . $env); + if ($env = $app->detectEnvironment(function() {})) { + putenv('APP_ENV='.$env); } if (! env('APP_ENV')) { From 528aa896706d22b3c601cf52c4dc83f16288de4e Mon Sep 17 00:00:00 2001 From: Sebastian Nowak Date: Thu, 28 Apr 2016 11:00:18 +0200 Subject: [PATCH 3/4] 5.2 fix code style #2 --- src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php index cdd5a31fdb90..08a11c7df070 100644 --- a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php +++ b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php @@ -35,7 +35,7 @@ public function bootstrap(Application $app) */ protected function checkForSpecificEnvironmentFile($app) { - if ($env = $app->detectEnvironment(function() {})) { + if ($env = $app->detectEnvironment(function(){})) { putenv('APP_ENV='.$env); } From 1ec6debb6fde418a2aa30f4e038593ea1ffc4ac1 Mon Sep 17 00:00:00 2001 From: Sebastian Nowak Date: Thu, 28 Apr 2016 11:00:48 +0200 Subject: [PATCH 4/4] 5.2 fix code style #3 --- src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php index 08a11c7df070..5fa8ea08013b 100644 --- a/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php +++ b/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php @@ -35,7 +35,7 @@ public function bootstrap(Application $app) */ protected function checkForSpecificEnvironmentFile($app) { - if ($env = $app->detectEnvironment(function(){})) { + if ($env = $app->detectEnvironment(function () {})) { putenv('APP_ENV='.$env); }