laravel · taylorotwell · May 9, 2025 · May 9, 2025
diff --git a/tests/Container/ContainerTest.php b/tests/Container/ContainerTest.php
@@ -2,9 +2,11 @@

 namespace Illuminate\Tests\Container;

+use Attribute;
 use Illuminate\Container\Container;
 use Illuminate\Container\EntryNotFoundException;
 use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Contracts\Container\ContextualAttribute;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerExceptionInterface;
 use stdClass;
@@ -522,6 +524,23 @@ public function testGetAlias()
        $this->assertSame('ConcreteStub', $container->getAlias('foo'));
    }

+    public function testCurrentlyResolving()
+    {
+    $container = new Container;
+
+    $container->afterResolvingAttribute(ContainerCurrentResolvingAttribute::class, function ($attr, $instance, $container) {
+        $this->assertEquals(ContainerCurrentResolvingConcrete::class, $container->currentlyResolving());
+    });
+
+    $container->when(ContainerCurrentResolvingConcrete::class)
+        ->needs('$currentlyResolving')
+        ->give(fn ($container) => $container->currentlyResolving());
+
+    $resolved = $container->make(ContainerCurrentResolvingConcrete::class);
+
+    $this->assertEquals(ContainerCurrentResolvingConcrete::class, $resolved->currentlyResolving);
+}
+
    public function testGetAliasRecursive()
    {
        $container = new Container;
@@ -860,3 +879,23 @@ public function work(IContainerContractStub $stub)
        return $stub;
    }
 }
+
+#[Attribute(Attribute::TARGET_PARAMETER)]
+class ContainerCurrentResolvingAttribute implements ContextualAttribute
+{
+    public function resolve()
+    {
+    }
+}
+
+class ContainerCurrentResolvingConcrete
+{
+    public $currentlyResolving;
+
+    public function __construct(
+        #[ContainerCurrentResolvingAttribute]
+        string $currentlyResolving
+    ) {
+        $this->currentlyResolving = $currentlyResolving;
+    }
+}