Allow specifying options in AutowireDatabase and AutowireCollection

README.md

@@ -128,7 +128,7 @@ class MyService
 }
 ```
 
-## Database and Collection Usage
+## Database Usage
 
 The client service provides access to databases and collections. You can access a database by calling the
 `selectDatabase` method, passing the database name and potential options:
@@ -183,6 +183,8 @@ class MyService
 }
 ```
 
+## Collection Usage
+
 To inject a collection, you can either call the `selectCollection` method on a `Client` or `Database` instance.
 For convenience, the `#[AutowireCollection]` attribute provides a quicker alternative:
 
@@ -261,3 +263,22 @@ class MyService
     ) {}
 }
 ```
+
+### Using a Codec
+
+To use a custom codec for a collection, you can specify the `codec` option in the `AutowireCollection` attribute. The
+codec class must implement the `MongoDB\Codec\DocumentCodec` interface. You can either pass an instance of the selected
+codec, or pass a service reference to the codec:
+
+```php
+use MongoDB\Bundle\Attribute\AutowireCollection;
+use MongoDB\Collection;
+
+class MyService
+{
+    public function __construct(
+        #[AutowireCollection(codec: MyCodec::class)]
+        private Collection $myCollection,
+    ) {}
+}
+```

composer.json

@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "mongodb/mongodb": "^1.16",
+        "mongodb/mongodb": "^1.17",
         "symfony/config": "^6.3 || ^7.0",
         "symfony/console": "^6.3 || ^7.0",
         "symfony/dependency-injection": "^6.3.5 || ^7.0",

src/Attribute/AutowireCollection.php

@@ -23,13 +23,15 @@
 use Attribute;
 use MongoDB\Bundle\DependencyInjection\MongoDBExtension;
 use MongoDB\Client;
+use MongoDB\Codec\DocumentCodec;
 use MongoDB\Collection;
 use ReflectionParameter;
 use Symfony\Component\DependencyInjection\Attribute\AutowireCallable;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
 use function is_string;
+use function ltrim;
 use function sprintf;
 
 /**
@@ -44,6 +46,7 @@ public function __construct(
         private readonly ?string $collection = null,
         private readonly ?string $database = null,
         ?string $client = null,
+        private readonly string|DocumentCodec|null $codec = null,
         private readonly array $options = [],
         bool|string $lazy = false,
     ) {
@@ -59,12 +62,21 @@ public function __construct(
 
     public function buildDefinition(mixed $value, ?string $type, ReflectionParameter $parameter): Definition
     {
+        $options = $this->options;
+        if ($this->codec !== null) {
+            $options['codec'] = $this->codec;
+        }
+
+        if (isset($options['codec']) && is_string($options['codec'])) {
+            $options['codec'] = new Reference(ltrim($options['codec'], '@'));
+        }
+
         return (new Definition(is_string($this->lazy) ? $this->lazy : ($type ?: Collection::class)))
             ->setFactory($value)
             ->setArguments([
                 $this->database ?? sprintf('%%%s.default_database%%', $this->serviceId),
                 $this->collection ?? $parameter->getName(),
-                $this->options,
+                $options,
             ])
             ->setLazy($this->lazy);
     }

tests/Unit/Attribute/AutowireCollectionTest.php

@@ -20,8 +20,12 @@
 
 namespace MongoDB\Bundle\Tests\Unit\Attribute;
 
+use MongoDB\BSON\Document;
 use MongoDB\Bundle\Attribute\AutowireCollection;
 use MongoDB\Client;
+use MongoDB\Codec\DecodeIfSupported;
+use MongoDB\Codec\DocumentCodec;
+use MongoDB\Codec\EncodeIfSupported;
 use MongoDB\Collection;
 use PHPUnit\Framework\TestCase;
 use ReflectionParameter;
@@ -109,4 +113,85 @@ static function (Collection $priceReports): void {
         $this->assertSame('priceReports', $definition->getArgument(1));
         $this->assertSame(['foo' => 'bar'], $definition->getArgument(2));
     }
+
+    public function testWithCodecOption(): void
+    {
+        $autowire = new AutowireCollection(
+            database: 'mydb',
+            client: 'default',
+            codec: '@my_codec',
+            options: ['foo' => 'bar'],
+        );
+
+        $this->assertEquals([new Reference('mongodb.client.default'), 'selectCollection'], $autowire->value);
+
+        $definition = $autowire->buildDefinition(
+            value: $autowire->value,
+            type: Collection::class,
+            parameter: new ReflectionParameter(
+                static function (Collection $priceReports): void {
+                },
+                'priceReports',
+            ),
+        );
+
+        $this->assertSame(Collection::class, $definition->getClass());
+        $this->assertEquals($autowire->value, $definition->getFactory());
+        $this->assertSame('mydb', $definition->getArgument(0));
+        $this->assertSame('priceReports', $definition->getArgument(1));
+        $this->assertEquals(['foo' => 'bar', 'codec' => new Reference('my_codec')], $definition->getArgument(2));
+    }
+
+    public function testWithCodecInstanceParameter(): void
+    {
+        $codec = new class implements DocumentCodec {
+            use DecodeIfSupported;
+            use EncodeIfSupported;
+
+            public function canDecode($value): bool
+            {
+                return $value instanceof Document;
+            }
+
+            public function canEncode($value): bool
+            {
+                return $value instanceof Document;
+            }
+
+            public function decode($value): Document
+            {
+                return $value;
+            }
+
+            public function encode($value): Document
+            {
+                return $value;
+            }
+        };
+
+        $autowire = new AutowireCollection(
+            database: 'mydb',
+            client: 'default',
+            codec: $codec,
+            options: ['foo' => 'bar'],
+        );
+
+        $this->assertEquals([new Reference('mongodb.client.default'), 'selectCollection'], $autowire->value);
+
+        $definition = $autowire->buildDefinition(
+            value: $autowire->value,
+            type: Collection::class,
+            parameter: new ReflectionParameter(
+                static function (Collection $priceReports): void {
+                },
+                'priceReports',
+            ),
+        );
+
+        $this->assertSame(Collection::class, $definition->getClass());
+        $this->assertEquals($autowire->value, $definition->getFactory());
+        $this->assertSame('mydb', $definition->getArgument(0));
+        $this->assertSame('priceReports', $definition->getArgument(1));
+        $this->assertEquals(['foo' => 'bar', 'codec' => $codec], $definition->getArgument(2));
+    }
 }