Merge branch '9.x' into 10.x

illuminate · Jan 10, 2023 · 2292554 · 2292554
2 parents 0618197 + 62d43e0
commit 2292554
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/Container.php b/Container.php
@@ -648,7 +648,25 @@ public function wrap(Closure $callback, array $parameters = [])
      */
     public function call($callback, array $parameters = [], $defaultMethod = null)
     {
-        return BoundMethod::call($this, $callback, $parameters, $defaultMethod);
+        $pushedToBuildStack = false;
+
+        if (is_array($callback) && ! in_array(
+            $className = (is_string($callback[0]) ? $callback[0] : get_class($callback[0])),
+            $this->buildStack,
+            true
+        )) {
+            $this->buildStack[] = $className;
+
+            $pushedToBuildStack = true;
+        }
+
+        $result = BoundMethod::call($this, $callback, $parameters, $defaultMethod);
+
+        if ($pushedToBuildStack) {
+            array_pop($this->buildStack);
+        }
+
+        return $result;
     }
 
     /**