Check if resolve is pending when firing callbacks

Author: tomlankhorst

src/Illuminate/Container/Container.php

@@ -1048,7 +1048,7 @@ protected function getCallbacksForType($abstract, $object, array $callbacksPerTy
         $results = [];
 
         foreach ($callbacksPerType as $type => $callbacks) {
-            if ($type === $abstract || ($object instanceof $type && ! in_array($type, $this->resolveStack))) {
+            if (! $this->pendingInResolveStack($object) && ($type === $abstract || $object instanceof $type)) {
                 $results = array_merge($results, $callbacks);
             }
         }
@@ -1070,6 +1070,24 @@ protected function fireCallbackArray($object, array $callbacks)
         }
     }
 
+    /**
+     * Check if object or a generalisation is pending in the resolve stack
+     *
+     * @param   object    $object
+     *
+     * @return  bool
+     */
+    protected function pendingInResolveStack($object)
+    {
+        foreach ($this->resolveStack as $resolving) {
+            if ($resolving !== end($this->resolveStack) && $object instanceof $resolving) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Get the container's bindings.
      *