added USE_ENV_ARRAY constant #3

oscarotero · Jul 17, 2017 · 93e933e · 93e933e
1 parent ce405ce
commit 93e933e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/Env.php b/src/Env.php
@@ -6,6 +6,7 @@ class Env
     const CONVERT_NULL = 2;
     const CONVERT_INT = 4;
     const STRIP_QUOTES = 8;
+    const USE_ENV_ARRAY = 16;
 
     public static $options = 15;   //All flags enabled
     public static $default = null; //Default value if not exists
@@ -34,7 +35,11 @@ public static function init()
      */
     public static function get($name)
     {
-        $value = getenv($name);
+        if (self::$options & self::USE_ENV_ARRAY) {
+            $value = isset($_ENV[$name]) ? $_ENV[$name] : false;
+        } else {
+            $value = getenv($name);
+        }
 
         if ($value === false) {
             return self::$default;

diff --git a/tests/ConversionTest.php b/tests/ConversionTest.php
@@ -41,5 +41,19 @@ public function testEnv()
         $this->assertSame(123, env('FOO'));
 
         $this->assertFalse(Env::init());
+
+        //Switch to $_ENV
+        Env::$options |= Env::USE_ENV_ARRAY;
+
+        $this->assertNull(env('FOO'));
+
+        $_ENV['FOO'] = 456;
+
+        $this->assertSame(456, env('FOO'));
+
+        //Switch to getenv again
+        Env::$options ^= Env::USE_ENV_ARRAY;
+
+        $this->assertSame(123, env('FOO'));
     }
 }