Issue #1 Fix loading of .env file

Author: mikehaertl

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.9.1
+
+ * Fix Issue #1: `.env` file not always processed
+
+Initial release.
 ## 0.9.0
 
 Initial release.

src/Config.php

@@ -235,14 +235,14 @@ public static function initEnv($directory = null)
         }
 
         // Define main Yii environment variables
-        if (isset($_ENV['YII_DEBUG'])) {
-            define('YII_DEBUG', (bool)$_ENV['YII_DEBUG']);
+        if (getenv('YII_DEBUG') !== false) {
+            define('YII_DEBUG', (bool)getenv('YII_DEBUG'));
             if (YII_DEBUG) {
                 error_reporting(E_ALL);
             }
         }
-        if (isset($_ENV['YII_ENV'])) {
-            define('YII_ENV', $_ENV['YII_ENV']);
+        if (getenv('YII_ENV') !== false) {
+            define('YII_ENV', getenv('YII_ENV'));
         }
     }
 
@@ -261,7 +261,7 @@ public static function env($name, $default = null, $required = false)
         if ($required) {
             \Dotenv::required($name);
         }
-        return isset($_ENV[$name]) ? $_ENV[$name] : $default;
+        return getenv($name) === false ? $default : getenv($name);
     }
 
 }

tests/ConsoleConfigTest.php

@@ -47,7 +47,7 @@ public function testCanMergeCustomConfig()
     public function testCanMergeLocalConfigByEnvVar()
     {
         $config = new Config(__DIR__ . '/app');
-        $_ENV['ENABLE_LOCALCONF'] = 1;
+        putenv('ENABLE_LOCALCONF=1');
         $console = $config->console([
             'key5' => 'test',
         ]);

tests/EnvTest.php

@@ -5,8 +5,8 @@ class EnvTest extends \PHPUnit_Framework_TestCase
 {
     public function testCanInitYiiEnvFromEnvVars()
     {
-        $_ENV['YII_DEBUG'] = true;
-        $_ENV['YII_ENV'] = 'prod';
+        putenv('YII_DEBUG=1');
+        putenv('YII_ENV=prod');
         Config::initEnv();
 
         $this->assertTrue(defined('YII_DEBUG'));
@@ -27,8 +27,8 @@ public function testCanInitYiiEnvFromEnvFile()
 
     public function testCanGetEnvVars()
     {
-        $_ENV['TEST1'] = 987;
-        $_ENV['TEST2'] = 'demo';
+        putenv('TEST1=987');
+        putenv('TEST2=demo');
 
         $this->assertEquals(987, Config::env('TEST1'));
         $this->assertEquals('demo', Config::env('TEST2'));
@@ -48,8 +48,8 @@ public function testCanGetEnvVarsFromEnvFile()
 
     public function testEnvFileDoesNotClearEnvVars()
     {
-        $_ENV['TEST1'] = 654;
-        $_ENV['TEST2'] = 'xyz';
+        putenv('TEST1=654');
+        putenv('TEST2=xyz');
         Config::initEnv(__DIR__ . '/app');
 
         $this->assertEquals(654, Config::env('TEST1'));
@@ -61,8 +61,8 @@ public function testEnvFileDoesNotClearEnvVars()
 
     public function testEnvFileDoesNotOverrideEnvVars()
     {
-        $_ENV['VAR1'] = 654;
-        $_ENV['VAR2'] = 'xyz';
+        putenv('VAR1=654');
+        putenv('VAR2=xyz');
         Config::initEnv(__DIR__ . '/app');
 
         $this->assertEquals('', Config::env('YII_DEBUG'));

tests/WebConfigTest.php

@@ -43,7 +43,7 @@ public function testCanMergeCustomConfig()
     public function testCanMergeLocalConfigByEnvVar()
     {
         $config = new Config(__DIR__ . '/app');
-        $_ENV['ENABLE_LOCALCONF'] = 1;
+        putenv('ENABLE_LOCALCONF=1');
         $web = $config->web([
             'key5' => 'test',
         ]);