Merge pull request #302 from clue-labs/container-factory-return

Throw `TypeError` when container factory returns `Closure`

Author: clue

src/Container.php

@@ -413,6 +413,10 @@ private function loadVariable(string $name, int $depth = 64) /*: object|string|i
                 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'
                 );
+            } elseif ($value instanceof \Closure) {
+                throw new \TypeError(
+                    'Return value of ' . self::functionName($closure) . ' for $' . $name . ' must not be of type Closure'
+                );
             }
 
             $this->container[$name] = $value;

tests/ContainerTest.php

@@ -2266,6 +2266,22 @@ public function testGetEnvThrowsIfFactoryFunctionReturnsInvalidResource(): void
         $container->getEnv('X_FOO');
     }
 
+    public function testGetEnvThrowsIfFactoryFunctionReturnsInvalidClosure(): void
+    {
+        $line = __LINE__ + 2;
+        $container = new Container([
+            'X_FOO' => function () {
+                return function () {
+                    return 42;
+                };
+            }
+        ]);
+
+        $this->expectException(\TypeError::class);
+        $this->expectExceptionMessage('Return value of {closure:' . __FILE__ . ':' . $line . '}() for $X_FOO must not be of type Closure');
+        $container->getEnv('X_FOO');
+    }
+
     public function testGetEnvThrowsIfFactoryFunctionReturnsInvalidInt(): void
     {
         $container = new Container([
@@ -2810,6 +2826,22 @@ public function testGetObjectThrowsIfFactoryFunctionReturnsInvalidValue(): void
         $container->getObject(AccessLogHandler::class);
     }
 
+    public function testGetObjectThrowsIfFactoryFunctionReturnsInvalidClosure(): void
+    {
+        $line = __LINE__ + 2;
+        $container = new Container([
+            AccessLogHandler::class => function () {
+                return function () {
+                    return 42;
+                };
+            }
+        ]);
+
+        $this->expectException(\TypeError::class);
+        $this->expectExceptionMessage('Return value of {closure:' . __FILE__ . ':' . $line . '}() for FrameworkX\AccessLogHandler must be of type FrameworkX\AccessLogHandler, Closure returned');
+        $container->getObject(AccessLogHandler::class);
+    }
+
     public function testGetObjectThrowsIfConfigIsRecursive(): void
     {
         $container = new Container([