Testing env function

codeigniter4 · Jan 17, 2017 · e69777b · e69777b
1 parent 726567d
commit e69777b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/system/Common.php b/system/Common.php
@@ -160,6 +160,10 @@ function view_cell(string $library, $params = null, int $ttl = 0, string $cacheN
     function env(string $key, $default = null)
     {
         $value = getenv($key);
+        if ($value === false)
+        {
+            $value = $_ENV[$key] ?? $_SERVER[$key] ?? false;
+        }
 
         // Not found? Return the default value
         if ($value === false)

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
@@ -7,6 +7,7 @@ class CommomFunctionsTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+	    unset($_ENV['foo'], $_SERVER['foo']);
 	}
 
 	//--------------------------------------------------------------------
@@ -42,4 +43,22 @@ public function testStringifyJsAttributes()
 
 	// ------------------------------------------------------------------------
 
+    public function testEnvReturnsDefault()
+    {
+        $this->assertEquals('baz', env('foo', 'baz'));
+    }
+
+    public function testEnvGetsFromSERVER()
+    {
+        $_SERVER['foo'] = 'bar';
+
+        $this->assertEquals('bar', env('foo', 'baz'));
+    }
+
+    public function testEnvGetsFromENV()
+    {
+        $_ENV['foo'] = 'bar';
+
+        $this->assertEquals('bar', env('foo', 'baz'));
+    }
 }