TinyEnv: Missing .env file not required — may cause unexpected behavior

@@ -1,9 +0,0 @@
-<?php
-
-require_once 'src/TinyEnv.php';
-require_once 'src/helper/helpers.php';
-
-$env = new \Datahihi1\TinyEnv\TinyEnv(__DIR__, true);
-$env->load();
-
-print_r(env('USER'));
\ No newline at end of file

@@ -1,7 +0,0 @@
-DB_HOST=localhost
-DB_PORT=3306
-DB_URL=${DB_HOST}:${DB_PORT}
-
-USER_NAME=
-USER=${USER_NAME:-guest}   # default if unset or empty
-ALT_USER=${USER_NAME-guest} # default if unset only
\ No newline at end of file

@@ -176,9 +176,10 @@ private function parseAndSetEnvLine(string $line, ?array $allowedKeys = null): v
         $line = trim($line);
         if ($line === '' || $line[0] === '#' || strpos($line, '=') === false)
             return;
-
-        [$key, $value] = explode('=', $line, 2);
-        $key = trim($key);
+        $eqPos = strpos($line, '=');
+        $key = trim(substr($line, 0, $eqPos));
+        $value = ltrim(substr($line, $eqPos + 1));
+        $value = self::stripEnvComment($value);
 
         if ($allowedKeys !== null && !in_array($key, $allowedKeys, true))
             return;
@@ -224,6 +225,29 @@ function (array $m): string {
         self::$cache[$key] = $parsed;
     }
 
+    /**
+     * Remove inline comment (not in quotes) from env value.
+     * @param string $value
+     * @return string
+     */
+    private static function stripEnvComment(string $value): string
+    {
+        $len = strlen($value);
+        $inSingle = false;
+        $inDouble = false;
+        for ($i = 0; $i < $len; $i++) {
+            $c = $value[$i];
+            if ($c === "'" && !$inDouble) {
+                $inSingle = !$inSingle;
+            } elseif ($c === '"' && !$inSingle) {
+                $inDouble = !$inDouble;
+            } elseif ($c === '#' && !$inSingle && !$inDouble) {
+                return rtrim(substr($value, 0, $i));
+            }
+        }
+        return $value;
+    }
+
     /**
      * Load environment variables from a specific .env file, optionally filtering by keys.
      *

@@ -0,0 +1,9 @@
+<?php
+
+require_once 'src/TinyEnv.php';
+require_once 'src/helper/helpers.php';
+
+$env = new \Datahihi1\TinyEnv\TinyEnv(__DIR__, true);
+$env->load();
+
+print_r(env('USER'));
\ No newline at end of file

@@ -0,0 +1,7 @@
+DB_HOST=localhost
+DB_PORT=3306
+DB_URL=${DB_HOST}:${DB_PORT}
+
+USER_NAME=
+USER=${USER_NAME:-guest}   # default if unset or empty
+ALT_USER=${USER_NAME-guest} # default if unset only
\ No newline at end of file

@@ -64,7 +64,6 @@ public function envfiles(array $files): self
     public function load($specificKeys = []): self
     {
         return $this->loadInternal($specificKeys);
-
     }
 
     /**
@@ -79,14 +78,19 @@ protected function loadInternal($specificKeys = [], bool $forceReload = false):
             return $this;
         $specificKeys = (array) $specificKeys;
         $filter = count($specificKeys) > 0 ? $specificKeys : null;
+        $found = false;
         foreach ($this->rootDirs as $dir) {
             foreach ($this->envFiles as $fileName) {
                 $file = $dir . DIRECTORY_SEPARATOR . $fileName;
                 if (is_file($file) && is_readable($file)) {
                     $this->loadEnvFile($file, $filter);
+                    $found = true;
                 }
             }
         }
+        if (!$found) {
+            throw new Exception("No .env file found in any root directory: [" . implode(", ", $this->rootDirs) . "] with files [" . implode(", ", $this->envFiles) . "]");
+        }
         self::$loaded = true;
         return $this;
     }