reading env from phpdotenv

Author: skoro

src/DotEnv.php

@@ -2,15 +2,14 @@
 
 namespace Tkui;
 
+use Dotenv\Dotenv as DotenvDotenv;
 use RuntimeException;
-use M1\Env\Parser as EnvParser;
 
 /**
  * .env file environment loader.
  */
 final class DotEnv implements Environment
 {
-    private array $data;
     private string $path;
     private string $filename;
 
@@ -22,7 +21,6 @@ public function __construct(string $path, string $filename = '.env')
     {
         $this->path = $path;
         $this->filename = $filename;
-        $this->data = [];
     }
 
     /**
@@ -32,8 +30,6 @@ public function __construct(string $path, string $filename = '.env')
      */
     public function load(): void
     {
-        $this->data = [];
-
         $file = $this->path . DIRECTORY_SEPARATOR . $this->filename;
         if (! file_exists($file)) {
             return;
@@ -43,10 +39,8 @@ public function load(): void
             throw new RuntimeException(sprintf('File "%s" is not readable.', $file));
         }
 
-        if (($buf = @file_get_contents($file)) === false) {
-            throw new RuntimeException("Couldn't read file: " . $file);
-        }
-        $this->data = EnvParser::parse($buf);
+        $dotenv = \Dotenv\Dotenv::createImmutable($this->path, $this->filename);
+        $dotenv->safeLoad();
     }
 
     /**
@@ -55,15 +49,24 @@ public function load(): void
     public function loadAndMergeWith(array $override): void
     {
         $this->load();
-        $this->data = array_merge($this->data, $override);
+        foreach ($override as $k => $v) {
+            $_ENV[$k] = $v;
+        }
     }
 
     /**
      * @inheritdoc
      */
     public function getValue(string $param, $default = null)
     {
-        return $this->data[$param] ?? $default;
+        $value = $_ENV[$param] ?? $default;
+        switch (strtolower($value)) {
+            case 'true':
+                return true;
+            case 'false':
+                return false;
+        }
+        return $value;
     }
 
     /**