Refactor Container to map class name aliases on demand instead of ctor

clue · Jul 27, 2022 · b86a271 · b86a271
1 parent 440cf7e
commit b86a271
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/src/Container.php b/src/Container.php
@@ -23,11 +23,7 @@ public function __construct($loader = [])
         }
 
         foreach (($loader instanceof ContainerInterface ? [] : $loader) as $name => $value) {
-            if (\is_string($value)) {
-                $loader[$name] = static function () use ($value) {
-                    return $value;
-                };
-            } elseif (!$value instanceof \Closure && !$value instanceof $name) {
+            if (!\is_string($value) && !$value instanceof \Closure && !$value instanceof $name) {
                 throw new \BadMethodCallException('Map for ' . $name . ' contains unexpected ' . (is_object($value) ? get_class($value) : gettype($value)));
             }
         }
@@ -126,7 +122,13 @@ public function getErrorHandler(): ErrorHandler
     private function load(string $name, int $depth = 64)
     {
         if (isset($this->container[$name])) {
-            if ($this->container[$name] instanceof \Closure) {
+            if (\is_string($this->container[$name])) {
+                if ($depth < 1) {
+                    throw new \BadMethodCallException('Factory for ' . $name . ' is recursive');
+                }
+
+                $this->container[$name] = $this->load($this->container[$name], $depth - 1);
+            } elseif ($this->container[$name] instanceof \Closure) {
                 // build list of factory parameters based on parameter types
                 $closure = new \ReflectionFunction($this->container[$name]);
                 $params = $this->loadFunctionParams($closure, $depth);

diff --git a/tests/ContainerTest.php b/tests/ContainerTest.php
@@ -340,6 +340,23 @@ public function testCallableReturnsCallableThatThrowsWhenFactoryIsRecursive()
         $callable($request);
     }
 
+    public function testCallableReturnsCallableThatThrowsWhenFactoryIsRecursiveClassName()
+    {
+        $request = new ServerRequest('GET', 'http://example.com/');
+
+        $container = new Container([
+            \stdClass::class => function (): string {
+                return \stdClass::class;
+            }
+        ]);
+
+        $callable = $container->callable(\stdClass::class);
+
+        $this->expectException(\BadMethodCallException::class);
+        $this->expectExceptionMessage('Factory for stdClass is recursive');
+        $callable($request);
+    }
+
     public function testCallableReturnsCallableForClassNameViaPsrContainer()
     {
         $request = new ServerRequest('GET', 'http://example.com/');