Use a single Loader call

Since php-dotenv 0.7.0, we have the ability to set multiple filepaths for a single load instance.
FriendsOfCake · Jun 5, 2015 · 3d430dc · 3d430dc
1 parent deb858e
commit 3d430dc
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/app/Config/core.php b/app/Config/core.php
@@ -36,24 +36,18 @@
 
 // Specify the APP_NAME environment variable to skip .env file loading
 if (!env('APP_NAME')) {
-	try {
-		josegonzalez\Dotenv\Loader::load([
-			'filepath' => __DIR__ . DS . '.env',
-			'toServer' => false,
-			'skipExisting' => ['toServer'],
-			'raiseExceptions' => true
-		]);
-	} catch (InvalidArgumentException $e) {
-		// If there's a problem loading the .env file - load .env.default
-		// That means the code can assume appropriate env config always exists
-		// Don't trap this incase there's some other fundamental error
-		josegonzalez\Dotenv\Loader::load([
-			'filepath' => __DIR__ . DS . '.env.default',
-			'toServer' => false,
-			'skipExisting' => ['toServer'],
-			'raiseExceptions' => true
-		]);
-	}
+	// If there's a problem loading the .env file - load .env.default
+	// That means the code can assume appropriate env config always exists
+	// Don't trap this incase there's some other fundamental error
+	josegonzalez\Dotenv\Loader::load([
+		'filepath' => [
+			__DIR__ . DS . '.env',
+			__DIR__ . DS . '.env.default',
+		]
+		'toServer' => false,
+		'skipExisting' => ['toServer'],
+		'raiseExceptions' => true
+	]);
 }
 
 /**