Load environment variables from live process environment if thread-safe

Author: clue

src/Container.php

@@ -13,6 +13,9 @@ class Container
     /** @var array<string,object|callable():(object|scalar|null)|scalar|null>|ContainerInterface */
     private $container;
 
+    /** @var bool */
+    private $useProcessEnv;
+
     /** @param array<string,callable():(object|scalar|null) | object | scalar | null>|ContainerInterface $loader */
     public function __construct($loader = [])
     {
@@ -32,6 +35,9 @@ public function __construct($loader = [])
             }
         }
         $this->container = $loader;
+
+        // prefer reading environment from `$_ENV` and `$_SERVER`, only fall back to `getenv()` in thread-safe environments
+        $this->useProcessEnv = \ZEND_THREAD_SAFE === false || \in_array(\PHP_SAPI, ['cli', 'cli-server', 'cgi-fcgi', 'fpm-fcgi'], true);
     }
 
     /** @return mixed */
@@ -296,7 +302,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)) || (isset($_ENV[$name]) || (\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) || ($this->useProcessEnv && \getenv($name) !== false)) && \preg_match('/^[A-Z][A-Z0-9_]+$/', $name));
     }
 
     /**
@@ -332,9 +338,12 @@ private function loadVariable(string $name, string $type, bool $nullable, int $d
         } elseif (isset($_ENV[$name])) {
             assert(\is_string($_ENV[$name]));
             $value = $_ENV[$name];
-        } else {
-            assert(\is_string($_SERVER[$name] ?? null));
+        } elseif (isset($_SERVER[$name])) {
+            assert(\is_string($_SERVER[$name]));
             $value = $_SERVER[$name];
+        } else {
+            $value = \getenv($name);
+            assert($this->useProcessEnv && $value !== false);
         }
 
         assert(\is_object($value) || \is_scalar($value) || $value === null);

tests/ContainerTest.php

@@ -2061,6 +2061,17 @@ public function testGetEnvReturnsStringFromGlobalServerIfNotSetInMap(): void
         $this->assertEquals('bar', $ret);
     }
 
+    public function testGetEnvReturnsStringFromProcessEnvIfNotSetInMap(): void
+    {
+        $container = new Container([]);
+
+        putenv('X_FOO=bar');
+        $ret = $container->getEnv('X_FOO');
+        putenv('X_FOO');
+
+        $this->assertEquals('bar', $ret);
+    }
+
     public function testGetEnvReturnsStringFromGlobalEnvBeforeServerIfNotSetInMap(): void
     {
         $container = new Container([]);
@@ -2073,6 +2084,19 @@ public function testGetEnvReturnsStringFromGlobalEnvBeforeServerIfNotSetInMap():
         $this->assertEquals('foo', $ret);
     }
 
+    public function testGetEnvReturnsStringFromGlobalEnvBeforeProcessEnvIfNotSetInMap(): void
+    {
+        $container = new Container([]);
+
+        $_ENV['X_FOO'] = 'foo';
+        putenv('X_FOO=bar');
+        $ret = $container->getEnv('X_FOO');
+        unset($_ENV['X_FOO']);
+        putenv('X_FOO');
+
+        $this->assertEquals('foo', $ret);
+    }
+
     public function testGetEnvReturnsStringFromPsrContainer(): void
     {
         $psr = $this->createMock(ContainerInterface::class);
@@ -2097,6 +2121,22 @@ public function testGetEnvReturnsNullIfPsrContainerHasNoEntry(): void
         $this->assertNull($container->getEnv('X_FOO'));
     }
 
+    public function testGetEnvReturnsStringFromProcessEnvIfPsrContainerHasNoEntry(): 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);
+
+        putenv('X_FOO=bar');
+        $ret = $container->getEnv('X_FOO');
+        putenv('X_FOO');
+
+        $this->assertEquals('bar', $ret);
+    }
+
     public function testGetEnvReturnsStringFromGlobalEnvIfPsrContainerHasNoEntry(): void
     {
         $psr = $this->createMock(ContainerInterface::class);
@@ -2146,6 +2186,24 @@ public function testGetEnvReturnsStringFromGlobalEnvBeforeServerIfPsrContainerHa
         $this->assertEquals('foo', $ret);
     }
 
+    public function testGetEnvReturnsStringFromGlobalEnvBeforeProcessEnvIfPsrContainerHasNoEntry(): 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';
+        putenv('X_FOO=bar');
+        $ret = $container->getEnv('X_FOO');
+        unset($_ENV['X_FOO']);
+        putenv('X_FOO');
+
+        $this->assertEquals('foo', $ret);
+    }
+
     public function testGetEnvThrowsIfMapContainsInvalidType(): void
     {
         $container = new Container([