Feat: BindWith > Tagging Support

src/Attributes/BindWith.php

@@ -11,6 +11,7 @@
     public function __construct(
         public string|array $concrete,
         public BindType $type = BindType::Transient,
+        public ?string $tag = null,
     ) {}
 
     /**
@@ -29,4 +30,9 @@ public function getType(): BindType
     {
         return $this->type;
     }
+
+    public function getTag(): ?string
+    {
+        return $this->tag;
+    }
 }

src/Contexts/BindContext.php

@@ -11,6 +11,7 @@ public function __construct(
         private string $abstract,
         private array $concrete,
         private BindType $type,
+        private ?string $tag = null,
     ) {}
 
     /**
@@ -47,4 +48,18 @@ public function isSingleton(): bool
     {
         return $this->type === BindType::Singleton;
     }
+
+    public function getTag(): string
+    {
+        if ($this->tag === null) {
+            return $this->abstract.'_tag';
+        }
+
+        return $this->tag;
+    }
+
+    public function hasTag(): bool
+    {
+        return $this->tag !== null;
+    }
 }

src/Providers/BindifyServiceProvider.php

@@ -47,10 +47,10 @@ private function beforeResolvingCallback(): Closure
                 );
             }
 
-            if (count($binding->getConcrete()) > 1) {
+            if ($binding->hasTag() || count($binding->getConcrete()) > 1) {
                 $container->tag(
                     $binding->getConcrete(),
-                    $binding->getAbstract().'_tag',
+                    $binding->getTag(),
                 );
             }
         };

src/Resolvers/AttributeResolver.php

@@ -38,6 +38,6 @@ public function resolve(string $abstract): ?BindContext
             return null;
         }
 
-        return new BindContext($abstract, $concretes, $bindWith->getType());
+        return new BindContext($abstract, $concretes, $bindWith->getType(), $bindWith->getTag());
     }
 }

tests/Feature/BindifyTest.php

@@ -50,25 +50,13 @@
 it('return null when invalid classes binding', function () {
     $this->assertNull($this->attributeResolver->resolve(InvalidClassBindingsContract::class));
 });
-
 it('binds multiple valid services to the same interface', function () {
-    /** @var BindContext $binding */
-    $binding = $this->attributeResolver->resolve(MultiBindContract::class);
+    app(MultiBindContract::class);
 
-    $expected = BindContext::create(
-        MultiBindContract::class,
-        [
-            DefaultImplementationService::class,
-            AlternativeImplementationService::class,
-        ],
-        BindType::Transient
-    );
+    $instances = $this->app->tagged('custom_tag');
 
-    expect($expected)
-        ->toEqual($binding)
-        ->and($binding->getConcrete())
-        ->toBeArray()
-        ->toHaveCount(2)
-        ->and($binding->getConcrete())
-        ->toEqual([DefaultImplementationService::class, AlternativeImplementationService::class]);
+    foreach ($instances as $instance) {
+        expect(get_class($instance))
+            ->toBeIn([DefaultImplementationService::class, AlternativeImplementationService::class]);
+    }
 });

workbench/app/Contracts/MultiBindContract.php

@@ -10,5 +10,5 @@
 #[BindWith([
     DefaultImplementationService::class,
     AlternativeImplementationService::class,
-], BindType::Transient)]
+], BindType::Transient, tag: 'custom_tag')]
 interface MultiBindContract {}