feat(container): allow to inject tagged singletons (#1544)

Author: steffans

packages/container/src/GenericContainer.php

@@ -419,13 +419,15 @@ private function autowire(string $className, mixed ...$params): object
         }
 
         foreach ($classReflector->getProperties() as $property) {
-            if ($property->hasAttribute(Inject::class) && ! $property->isInitialized($instance)) {
+            $inject = $property->getAttribute(Inject::class);
+
+            if ($inject && ! $property->isInitialized($instance)) {
                 if ($property->hasAttribute(Proxy::class)) {
                     $property->set($instance, $property->getType()->asClass()->getReflection()->newLazyProxy(
-                        fn () => $this->get($property->getType()->getName()),
+                        fn () => $this->get($property->getType()->getName(), $inject->tag),
                     ));
                 } else {
-                    $property->set($instance, $this->get($property->getType()->getName()));
+                    $property->set($instance, $this->get($property->getType()->getName(), $inject->tag));
                 }
             }
         }

packages/container/src/Inject.php

@@ -9,4 +9,7 @@
 #[Attribute(Attribute::TARGET_PROPERTY)]
 final readonly class Inject
 {
+    public function __construct(
+        public ?string $tag = null,
+    ) {}
 }

packages/container/tests/ContainerTest.php

@@ -427,11 +427,13 @@ public function test_builtin_dependency_initializer(): void
     public function test_inject(): void
     {
         $container = new GenericContainer();
+        $container->singleton(InjectB::class, $bTagged = new InjectB(), 'tagged');
 
         /** @var InjectA $a */
         $a = $container->get(InjectA::class);
 
         $this->assertInstanceOf(InjectB::class, $a->getB());
+        $this->assertSame($bTagged, $a->getBTagged());
     }
 
     public function test_unregister(): void

packages/container/tests/Fixtures/InjectA.php

@@ -11,8 +11,16 @@
     #[Inject]
     private InjectB $b; // @phpstan-ignore-line
 
+    #[Inject('tagged')]
+    private InjectB $bTagged; // @phpstan-ignore-line
+
     public function getB(): InjectB
     {
         return $this->b;
     }
+
+    public function getBTagged(): InjectB
+    {
+        return $this->bTagged;
+    }
 }