Allow recursive container calls from factory functions for variables

Author: clue

src/Container.php

@@ -395,17 +395,15 @@ private function loadVariable(string $name, int $depth = 64) /*: object|string|i
             \assert($factory instanceof \Closure);
             $closure = new \ReflectionFunction($factory);
 
-            // build list of factory parameters based on parameter types
+            // invoke factory with list of parameters
             // temporarily unset factory reference to allow loading recursive variables from environment
             try {
                 unset($this->container[$name]);
-                $params = $this->loadFunctionParams($closure, $depth - 1, true, '$' . $name);
+                $value = $factory(...$this->loadFunctionParams($closure, $depth - 1, true, '$' . $name));
             } finally {
                 $this->container[$name] = $factory;
             }
 
-            // invoke factory with list of parameters
-            $value = $factory(...$params);
             if (!\is_object($value) && !\is_scalar($value) && $value !== null) {
                 throw new \TypeError(
                     'Return value of ' . self::functionName($closure) . ' for $' . $name . ' must be of type object|string|int|float|bool|null, ' . $this->gettype($value) . ' returned'

tests/ContainerTest.php

@@ -2126,6 +2126,28 @@ public function testGetEnvReturnsStringFromRecursiveFactoryWithDefaultValueIfNot
         $this->assertEquals('foo', $container->getEnv('X_FOO'));
     }
 
+    public function testGetEnvReturnsNullIfFactoryFunctionUsesRecursiveGetEnvForVariableNotSetInGlobalEnv(): void
+    {
+        $container = new Container([
+            'X_FOO' => function (Container $container) { return $container->getEnv('X_FOO'); }
+        ]);
+
+        $this->assertNull($container->getEnv('X_FOO'));
+    }
+
+    public function testGetEnvReturnsStringIfFactoryFunctionUsesRecursiveGetEnvForVariableSetInGlobalEnv(): void
+    {
+        $container = new Container([
+            'X_FOO' => function (Container $container) { return $container->getEnv('X_FOO'); }
+        ]);
+
+        $_ENV['X_FOO'] = 'foo';
+        $ret = $container->getEnv('X_FOO');
+        unset($_ENV['X_FOO']);
+
+        $this->assertEquals('foo', $ret);
+    }
+
     public function testGetEnvReturnsStringFromPsrContainer(): void
     {
         $psr = $this->createMock(ContainerInterface::class);