Ensure a string is returned if defined and happens to be a non existent class name

Author: philipobenito

src/Definition/Definition.php

@@ -57,9 +57,9 @@ class Definition implements ArgumentResolverInterface, DefinitionInterface
     protected $resolved;
 
     /**
-     * @var bool
+     * @var array
      */
-    protected $isAlreadySearched = false;
+    protected $recursiveCheck = [];
 
     /**
      * @param string     $id
@@ -192,16 +192,15 @@ public function resolveNew()
         }
 
         // stop recursive resolving
-        if ($this->isAlreadySearched) {
-            throw new NotFoundException(
-                sprintf('Alias or class "%s" did not found.', $concrete)
-            );
+        if (is_string($concrete) && in_array($concrete, $this->recursiveCheck)) {
+            $this->resolved = $concrete;
+            return $concrete;
         }
 
         // if we still have a string, try to pull it from the container
         // this allows for `alias -> alias -> ... -> concrete
         if (is_string($concrete) && $container instanceof ContainerInterface && $container->has($concrete)) {
-            $this->isAlreadySearched = true;
+            $this->recursiveCheck[] = $concrete;
             $concrete = $container->get($concrete);
         }
 

tests/ContainerTest.php

@@ -228,8 +228,6 @@ public function testNonExistentClassCausesException(): void
         $container->add(NonExistent::class);
 
         self::assertTrue($container->has(NonExistent::class));
-
-        $this->expectException(NotFoundException::class);
-        $container->get(NonExistent::class);
+        self::assertSame(NonExistent::class, $container->get(NonExistent::class));
     }
 }