Remove parameter name usage for AutowireDatabase

Author: alcaeus

src/Attribute/AutowireDatabase.php

@@ -30,25 +30,28 @@
 use Symfony\Component\DependencyInjection\Reference;
 
 use function is_string;
+use function sprintf;
 
 /**
  * Autowires a MongoDB database.
  */
 #[Attribute(Attribute::TARGET_PARAMETER)]
 final class AutowireDatabase extends AutowireCallable
 {
+    private readonly string $serviceId;
+
     public function __construct(
         private readonly ?string $database = null,
         ?string $client = null,
         private readonly array $options = [],
         bool|string $lazy = false,
     ) {
-        $callable = $client === null
-            ? [new Reference(Client::class), 'selectDatabase']
-            : [new Reference(MongoDBExtension::createClientServiceId($client)), 'selectDatabase'];
+        $this->serviceId = $client === null
+            ? Client::class
+            : MongoDBExtension::createClientServiceId($client);
 
         parent::__construct(
-            callable: $callable,
+            callable: [new Reference($this->serviceId), 'selectDatabase'],
             lazy: $lazy,
         );
     }
@@ -57,7 +60,10 @@ public function buildDefinition(mixed $value, ?string $type, ReflectionParameter
     {
         return (new Definition(is_string($this->lazy) ? $this->lazy : ($type ?: Database::class)))
             ->setFactory($value)
-            ->setArguments([$this->database ?? $parameter->getName(), $this->options])
+            ->setArguments([
+                $this->database ?? sprintf('%%%s.default_database%%', $this->serviceId),
+                $this->options,
+            ])
             ->setLazy($this->lazy);
     }
 }

tests/TestApplication/src/Controller/AutowireDatabaseController.php

@@ -46,10 +46,10 @@ public function withoutArguments(
     /** @see AutowireClientTest::testWithCustomClientSetViaOptions() */
     #[Route('/with-custom-client')]
     public function withCustomClient(
-        #[AutowireDatabase(client: FunctionalTestCase::CLIENT_ID_SECONDARY)]
-        Database $google,
+        #[AutowireDatabase(database: 'google', client: FunctionalTestCase::CLIENT_ID_SECONDARY)]
+        Database $database,
     ): JsonResponse {
-        $this->insertDocumentForDatabase($google, FunctionalTestCase::COLLECTION_USERS);
+        $this->insertDocumentForDatabase($database, FunctionalTestCase::COLLECTION_USERS);
 
         return new JsonResponse();
     }

tests/Unit/Attribute/AutowireDatabaseTest.php

@@ -48,7 +48,7 @@ static function (Database $mydb): void {
 
         $this->assertSame(Database::class, $definition->getClass());
         $this->assertEquals($autowire->value, $definition->getFactory());
-        $this->assertSame('mydb', $definition->getArgument(0));
+        $this->assertSame('%MongoDB\Client.default_database%', $definition->getArgument(0));
     }
 
     public function testDatabase(): void
@@ -98,7 +98,7 @@ static function (Database $mydb): void {
 
         $this->assertSame(Database::class, $definition->getClass());
         $this->assertEquals($autowire->value, $definition->getFactory());
-        $this->assertSame('mydb', $definition->getArgument(0));
+        $this->assertSame('%mongodb.client.default.default_database%', $definition->getArgument(0));
         $this->assertSame(['foo' => 'bar'], $definition->getArgument(1));
     }
 }