Refactor

src/Definition/Definition.php

@@ -21,8 +21,6 @@ class Definition implements ArgumentResolverInterface, DefinitionInterface
     use ArgumentResolverTrait;
     use ContainerAwareTrait;
 
-    private const RECURSIVE_RESOLVE_MAX = 10;
-
     /**
      * @var string
      */
@@ -59,9 +57,9 @@ class Definition implements ArgumentResolverInterface, DefinitionInterface
     protected $resolved;
 
     /**
-     * @var int
+     * @var bool
      */
-    protected $recursiveResolveCount = 0;
+    protected $isAlreadySearched = false;
 
     /**
      * @param string     $id
@@ -193,15 +191,17 @@ public function resolveNew()
             $container = null;
         }
 
+        // stop recursive resolving
+        if ($this->isAlreadySearched) {
+            throw new NotFoundException(
+                sprintf('Alias or class "%s" did not found.', $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)) {
-            if ($this->recursiveResolveCount++ > self::RECURSIVE_RESOLVE_MAX) {
-                throw new NotFoundException(
-                    sprintf('Alias "%s" did not found or alias too deep.', $concrete)
-                );
-            }
-
+            $this->isAlreadySearched = true;
             $concrete = $container->get($concrete);
         }