[11.x] Fix using container nesting to make the same 'abstract' in dif…

…ferent context (#51989) * Fix using container nesting to make the same 'abstract' in different context * formatting' : --------- Co-authored-by: Taylor Otwell <[email protected]>
laravel · Jul 2, 2024 · 8d20a9c · 8d20a9c
1 parent b6a2abd
commit 8d20a9c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
@@ -925,7 +925,13 @@ public function build($concrete)
         // hand back the results of the functions, which allows functions to be
         // used as resolvers for more fine-tuned resolution of these objects.
         if ($concrete instanceof Closure) {
-            return $concrete($this, $this->getLastParameterOverride());
+            $this->buildStack[] = spl_object_hash($concrete);
+
+            try {
+                return $concrete($this, $this->getLastParameterOverride());
+            } finally {
+                array_pop($this->buildStack);
+            }
         }
 
         try {

diff --git a/tests/Container/ContextualBindingTest.php b/tests/Container/ContextualBindingTest.php
@@ -40,6 +40,21 @@ public function testContainerCanInjectDifferentImplementationsDependingOnContext
 
         $this->assertInstanceOf(ContainerContextImplementationStub::class, $one->impl);
         $this->assertInstanceOf(ContainerContextImplementationStubTwo::class, $two->impl);
+
+        /*
+         * Test nesting to make the same 'abstract' in different context
+         */
+        $container = new Container;
+
+        $container->bind(IContainerContextContractStub::class, ContainerContextImplementationStub::class);
+
+        $container->when(ContainerTestContextInjectOne::class)->needs(IContainerContextContractStub::class)->give(function ($container) {
+            return $container->make(IContainerContextContractStub::class);
+        });
+
+        $one = $container->make(ContainerTestContextInjectOne::class);
+
+        $this->assertInstanceOf(ContainerContextImplementationStub::class, $one->impl);
     }
 
     public function testContextualBindingWorksForExistingInstancedBindings()