Resolve Circular dependency problem

Author: mohamed-samir907

src/Autowire.php

@@ -11,6 +11,13 @@
 
 trait Resolver
 {
+    /**
+     * Build stack to detect cirular dependency.
+     *
+     * @var array
+     */
+    private array $buildStack = [];
+
     /**
      * Resolve the entry.
      *
@@ -72,7 +79,7 @@ protected function build($entry)
      * @param  string $entry
      * @return object
      */
-    protected function autowire($entry)
+    protected function autowire(string $entry)
     {
         try {
             $reflector = new ReflectionClass($entry);
@@ -90,10 +97,19 @@ protected function autowire($entry)
             return new $entry;
         }
 
+        // To Detect the circular dependency
+        if (in_array($entry, $this->buildStack)) {
+            throw new BindingException("Circular dependency.");
+        }
+
+        $this->buildStack[] = $entry;
+
         $instances = $this->resolveDependencies(
             $constructor->getParameters()
         );
 
+        array_pop($this->buildStack);
+
         return $reflector->newInstanceArgs($instances);
     }
 
@@ -113,11 +129,9 @@ protected function resolveDependencies(array $dependencies)
             $declaringClass = $dependency->getDeclaringClass()->getName();
 
             if ($type->isBuiltin() || !$type instanceof ReflectionNamedType) {
-                throw new BindingException("Unresolvable dependency: resolving [$dependency] in class {$declaringClass}");
-            }
-
-            if ($this->isCircularDependency($declaringClass, $type)) {
-                throw new BindingException("Circular dependency.");
+                throw new BindingException(
+                    "Unresolvable dependency: resolving [$dependency] in class {$declaringClass}"
+                );
             }
 
             $results[] = $this->resolve($type->getName());
@@ -126,24 +140,6 @@ protected function resolveDependencies(array $dependencies)
         return $results;
     }
 
-    /**
-     * Check if there exists circular dependency.
-     *
-     * @param  string $declaringClass
-     * @param  ReflectionNamedType $type
-     * @return bool
-     */
-    protected function isCircularDependency(string $declaringClass, ReflectionNamedType $type)
-    {
-        if ($declaringClass == $type->getName()) {
-            return true;
-        }
-
-        $autowire = new Autowire($type->getName());
-
-        return $autowire->constructHasType($declaringClass);
-    }
-
     /**
      * Check if the entry is shared or not.
      *

src/Resolver.php

@@ -192,6 +192,13 @@ public function __construct(B $b)
 }
 
 class B
+{
+    public function __construct(C $a)
+    {
+    }
+}
+
+class C
 {
     public function __construct(A $a)
     {