Do not mix $_ENV with $_SERVER, except for ENVIRONMENT

Author: natanfelles

boot/helpers.php

@@ -330,5 +330,5 @@ function model(string $class) : Model
  */
 function env(string $key, mixed $default = null) : mixed
 {
-    return $_ENV[$key] ?? $_SERVER[$key] ?? $default;
+    return $_ENV[$key] ?? $default;
 }

boot/init.php

@@ -7,8 +7,8 @@
  */
 if (is_file(__DIR__ . '/../.env.php')) {
     require __DIR__ . '/../.env.php';
-    foreach ($_ENV as $key => $value) {
-        $_SERVER[$key] = $value;
+    if (isset($_ENV['ENVIRONMENT'])) {
+        $_SERVER['ENVIRONMENT'] = $_ENV['ENVIRONMENT'];
     }
 }
 

tests/boot/HelpersTest.php

@@ -264,7 +264,7 @@ public function testEnv() : void
         $_SERVER['foo'] = 'bar';
         $_SERVER['bar'] = 'baz';
         self::assertSame('foo', env('foo'));
-        self::assertSame('baz', env('bar'));
+        self::assertNull(env('bar'));
         self::assertNull(env('unknown'));
     }
 }