Load environment variables from $_ENV before checking $_SERVER

Author: clue

src/Container.php

@@ -296,7 +296,7 @@ private function loadParameter(\ReflectionParameter $parameter, int $depth, bool
 
     private function hasVariable(string $name): bool
     {
-        return (\is_array($this->container) && \array_key_exists($name, $this->container)) || (\is_string($_SERVER[$name] ?? null) && \preg_match('/^[A-Z][A-Z0-9_]+$/', $name));
+        return (\is_array($this->container) && \array_key_exists($name, $this->container)) || (isset($_ENV[$name]) || (\is_string($_SERVER[$name] ?? null)) && \preg_match('/^[A-Z][A-Z0-9_]+$/', $name));
     }
 
     /**
@@ -329,6 +329,9 @@ private function loadVariable(string $name, string $type, bool $nullable, int $d
             $this->container[$name] = $value;
         } elseif (\is_array($this->container) && \array_key_exists($name, $this->container)) {
             $value = $this->container[$name];
+        } elseif (isset($_ENV[$name])) {
+            assert(\is_string($_ENV[$name]));
+            $value = $_ENV[$name];
         } else {
             assert(\is_string($_SERVER[$name] ?? null));
             $value = $_SERVER[$name];

tests/ContainerTest.php

@@ -2039,6 +2039,17 @@ public function testGetEnvReturnsStringFromMapFactory(): void
         $this->assertEquals('bar', $container->getEnv('X_FOO'));
     }
 
+    public function testGetEnvReturnsStringFromGlobalEnvIfNotSetInMap(): void
+    {
+        $container = new Container([]);
+
+        $_ENV['X_FOO'] = 'bar';
+        $ret = $container->getEnv('X_FOO');
+        unset($_ENV['X_FOO']);
+
+        $this->assertEquals('bar', $ret);
+    }
+
     public function testGetEnvReturnsStringFromGlobalServerIfNotSetInMap(): void
     {
         $container = new Container([]);
@@ -2050,6 +2061,18 @@ public function testGetEnvReturnsStringFromGlobalServerIfNotSetInMap(): void
         $this->assertEquals('bar', $ret);
     }
 
+    public function testGetEnvReturnsStringFromGlobalEnvBeforeServerIfNotSetInMap(): void
+    {
+        $container = new Container([]);
+
+        $_ENV['X_FOO'] = 'foo';
+        $_SERVER['X_FOO'] = 'bar';
+        $ret = $container->getEnv('X_FOO');
+        unset($_ENV['X_FOO'], $_SERVER['X_FOO']);
+
+        $this->assertEquals('foo', $ret);
+    }
+
     public function testGetEnvReturnsStringFromPsrContainer(): void
     {
         $psr = $this->createMock(ContainerInterface::class);
@@ -2074,6 +2097,22 @@ public function testGetEnvReturnsNullIfPsrContainerHasNoEntry(): void
         $this->assertNull($container->getEnv('X_FOO'));
     }
 
+    public function testGetEnvReturnsStringFromGlobalEnvIfPsrContainerHasNoEntry(): void
+    {
+        $psr = $this->createMock(ContainerInterface::class);
+        $psr->expects($this->atLeastOnce())->method('has')->with('X_FOO')->willReturn(false);
+        $psr->expects($this->never())->method('get');
+
+        assert($psr instanceof ContainerInterface);
+        $container = new Container($psr);
+
+        $_ENV['X_FOO'] = 'bar';
+        $ret = $container->getEnv('X_FOO');
+        unset($_ENV['X_FOO']);
+
+        $this->assertEquals('bar', $ret);
+    }
+
     public function testGetEnvReturnsStringFromGlobalServerIfPsrContainerHasNoEntry(): void
     {
         $psr = $this->createMock(ContainerInterface::class);
@@ -2090,6 +2129,23 @@ public function testGetEnvReturnsStringFromGlobalServerIfPsrContainerHasNoEntry(
         $this->assertEquals('bar', $ret);
     }
 
+    public function testGetEnvReturnsStringFromGlobalEnvBeforeServerIfPsrContainerHasNoEntry(): void
+    {
+        $psr = $this->createMock(ContainerInterface::class);
+        $psr->expects($this->atLeastOnce())->method('has')->with('X_FOO')->willReturn(false);
+        $psr->expects($this->never())->method('get');
+
+        assert($psr instanceof ContainerInterface);
+        $container = new Container($psr);
+
+        $_ENV['X_FOO'] = 'foo';
+        $_SERVER['X_FOO'] = 'bar';
+        $ret = $container->getEnv('X_FOO');
+        unset($_ENV['X_FOO'], $_SERVER['X_FOO']);
+
+        $this->assertEquals('foo', $ret);
+    }
+
     public function testGetEnvThrowsIfMapContainsInvalidType(): void
     {
         $container = new Container([