Merge pull request #5 from codemix/4-upgrade-dotenv

Issue #4 Upgrade to Dotenv 2.5.x

Author: mikehaertl

composer.json

@@ -11,7 +11,7 @@
     ],
     "require": {
       "yiisoft/yii2": "*",
-      "vlucas/phpdotenv": "1.0.*"
+      "vlucas/phpdotenv": "2.5.*"
     },
     "autoload": {
         "psr-4": {

src/Config.php

@@ -231,7 +231,8 @@ public static function bootstrap($directory, $vendor = null, $initEnv = true)
     public static function initEnv($directory = null)
     {
         if ($directory !== null && file_exists($directory . DIRECTORY_SEPARATOR . '.env')) {
-            \Dotenv::load($directory);
+            $dotenv = new \Dotenv\Dotenv($directory);
+            $dotenv->load();
         }
 
         // Define main Yii environment variables
@@ -260,17 +261,16 @@ public static function initEnv($directory = null)
      */
     public static function env($name, $default = null, $required = false)
     {
-        if ($required) {
-            \Dotenv::required($name);
-        }
         if (array_key_exists($name, $_ENV)) {
             return $_ENV[$name];
         }
         if (array_key_exists($name, $_SERVER)) {
             return $_SERVER[$name];
         }
         $value = getenv($name);
+        if ($value === false && $required) {
+            throw new \Exception("Environment variable '$name' is not set");
+        }
         return $value === false ? $default : $value;
     }
-
 }

tests/EnvTest.php

@@ -35,11 +35,21 @@ public function testCanGetEnvVars()
         $this->assertEquals('default', Config::env('TEST3', 'default'));
     }
 
+    public function testCanRequireEnvVar()
+    {
+        try {
+            $x = Config::env('DOESNOTEXIST', null, true);
+            $this->fail('No exception thrown for missing env variable');
+        } catch (\Exception $e) {
+            $this->assertEquals("Environment variable 'DOESNOTEXIST' is not set", $e->getMessage());
+        }
+    }
+
     public function testCanGetEnvVarsFromEnvFile()
     {
         Config::initEnv(__DIR__ . '/app');
 
-        $this->assertEquals('', Config::env('YII_DEBUG'));
+        $this->assertEquals(0, Config::env('YII_DEBUG'));
         $this->assertEquals('dev', Config::env('YII_ENV'));
         $this->assertEquals('dotenv1', Config::env('VAR1'));
         $this->assertEquals(2, Config::env('VAR2'));
@@ -65,7 +75,7 @@ public function testEnvFileDoesNotOverrideEnvVars()
         putenv('VAR2=xyz');
         Config::initEnv(__DIR__ . '/app');
 
-        $this->assertEquals('', Config::env('YII_DEBUG'));
+        $this->assertEquals(0, Config::env('YII_DEBUG'));
         $this->assertEquals('dev', Config::env('YII_ENV'));
         $this->assertEquals(654, Config::env('VAR1'));
         $this->assertEquals('xyz', Config::env('VAR2'));