Support boolean values in $_ENV and $_SERVER (#457)

vlucas · Sep 14, 2020 · fba6413 · fba6413
1 parent 3af4965
commit fba6413
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 6 deletions.
diff --git a/src/Repository/Adapter/EnvConstAdapter.php b/src/Repository/Adapter/EnvConstAdapter.php
@@ -40,9 +40,20 @@ public static function create()
     public function read(string $name)
     {
         /** @var \PhpOption\Option<string> */
-        return Option::fromArraysValue($_ENV, $name)->filter(static function ($value) {
-            return \is_string($value);
-        });
+        return Option::fromArraysValue($_ENV, $name)
+            ->map(static function ($value) {
+                if ($value === false) {
+                    return 'false';
+                }
+
+                if ($value === true) {
+                    return 'true';
+                }
+
+                return $value;
+            })->filter(static function ($value) {
+                return \is_string($value);
+            });
     }
 
     /**

diff --git a/src/Repository/Adapter/ServerConstAdapter.php b/src/Repository/Adapter/ServerConstAdapter.php
@@ -40,9 +40,20 @@ public static function create()
     public function read(string $name)
     {
         /** @var \PhpOption\Option<string> */
-        return Option::fromArraysValue($_SERVER, $name)->filter(static function ($value) {
-            return \is_string($value);
-        });
+        return Option::fromArraysValue($_SERVER, $name)
+            ->map(static function ($value) {
+                if ($value === false) {
+                    return 'false';
+                }
+
+                if ($value === true) {
+                    return 'true';
+                }
+
+                return $value;
+            })->filter(static function ($value) {
+                return \is_string($value);
+            });
     }
 
     /**

diff --git a/tests/Dotenv/Repository/Adapter/EnvConstAdapterTest.php b/tests/Dotenv/Repository/Adapter/EnvConstAdapterTest.php
@@ -17,6 +17,22 @@ public function testGoodRead()
         self::assertSame('foo bar baz', $value->get());
     }
 
+    public function testFalseRead()
+    {
+        $_ENV['CONST_TEST'] = false;
+        $value = self::createAdapter()->read('CONST_TEST');
+        self::assertTrue($value->isDefined());
+        self::assertSame('false', $value->get());
+    }
+
+    public function testTrueRead()
+    {
+        $_ENV['CONST_TEST'] = true;
+        $value = self::createAdapter()->read('CONST_TEST');
+        self::assertTrue($value->isDefined());
+        self::assertSame('true', $value->get());
+    }
+
     public function testBadTypeRead()
     {
         $_ENV['CONST_TEST'] = 123;

diff --git a/tests/Dotenv/Repository/Adapter/ServerConstAdapterTest.php b/tests/Dotenv/Repository/Adapter/ServerConstAdapterTest.php
@@ -17,6 +17,22 @@ public function testGoodRead()
         self::assertSame('foo bar baz', $value->get());
     }
 
+    public function testFalseRead()
+    {
+        $_SERVER['CONST_TEST'] = false;
+        $value = self::createAdapter()->read('CONST_TEST');
+        self::assertTrue($value->isDefined());
+        self::assertSame('false', $value->get());
+    }
+
+    public function testTrueRead()
+    {
+        $_SERVER['CONST_TEST'] = true;
+        $value = self::createAdapter()->read('CONST_TEST');
+        self::assertTrue($value->isDefined());
+        self::assertSame('true', $value->get());
+    }
+
     public function testBadTypeRead()
     {
         $_SERVER['CONST_TEST'] = 123;