Merge pull request #11 from NeoBlack/develop

[BUGFIX] Fix broken .env detection
TYPO3GmbH · Jul 28, 2017 · 7b86383 · 7b86383
2 parents cad0a89 + 1f770db
commit 7b86383
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/bootstrap.php b/bootstrap.php
@@ -12,9 +12,9 @@
 // env config
 // Determine the .env file in package directory ($baseBath === __DIR__) and getcwd()
 // this prevent path errors in case of global composer installation and package requirement
-foreach([$basePath . DIRECTORY_SEPARATOR . '.env', getcwd() . DIRECTORY_SEPARATOR . '.env'] as $file) {
-    if (file_exists($file)) {
-        $dotenv = new Dotenv\Dotenv($basePath);
+foreach([$basePath, getcwd()] as $directory) {
+    if (file_exists($directory . DIRECTORY_SEPARATOR . '.env')) {
+        $dotenv = new Dotenv\Dotenv($directory);
         $dotenv->load();
         break;
     }