ref

Author: Guikingone

src/ai-bundle/src/AiBundle.php

@@ -1497,14 +1497,14 @@ private function processMessageStoreConfig(string $type, array $messageStores, C
         }
 
         if ('doctrine' === $type) {
-            foreach ($messageStores['dbal'] ?? [] as $name => $ormMessageStore) {
+            foreach ($messageStores['dbal'] ?? [] as $name => $dbalMessageStore) {
                 $definition = new Definition(DoctrineDbalMessageStore::class);
                 $definition
                     ->setLazy(true)
                     ->setArguments([
-                        $ormMessageStore['connection'],
-                        $ormMessageStore['table_name'] ?? $name,
-                        new Reference('doctrine'),
+                        $dbalMessageStore['connection'],
+                        $dbalMessageStore['table_name'] ?? $name,
+                        new Reference(\sprintf('doctrine.dbal.%s_connection', $dbalMessageStore['connection'])),
                         new Reference('serializer'),
                     ])
                     ->addTag('proxy', ['interface' => MessageStoreInterface::class])

src/ai-bundle/tests/DependencyInjection/AiBundleTest.php

@@ -2851,7 +2851,7 @@ public function testCacheMessageStoreCanBeConfiguredWithCustomTtl()
         $this->assertTrue($cacheMessageStoreDefinition->hasTag('ai.message_store'));
     }
 
-    public function testDoctrineOrmMessageStoreCanBeConfiguredWithCustomKey()
+    public function testDoctrineDbalMessageStoreCanBeConfiguredWithCustomKey()
     {
         $container = $this->buildContainer([
             'ai' => [
@@ -2872,7 +2872,7 @@ public function testDoctrineOrmMessageStoreCanBeConfiguredWithCustomKey()
         $this->assertSame('default', (string) $doctrineDbalDefaultMessageStoreDefinition->getArgument(0));
         $this->assertSame('default', (string) $doctrineDbalDefaultMessageStoreDefinition->getArgument(1));
         $this->assertInstanceOf(Reference::class, $doctrineDbalDefaultMessageStoreDefinition->getArgument(2));
-        $this->assertSame('doctrine', (string) $doctrineDbalDefaultMessageStoreDefinition->getArgument(2));
+        $this->assertSame('doctrine.dbal.default_connection', (string) $doctrineDbalDefaultMessageStoreDefinition->getArgument(2));
         $this->assertInstanceOf(Reference::class, $doctrineDbalDefaultMessageStoreDefinition->getArgument(3));
         $this->assertSame('serializer', (string) $doctrineDbalDefaultMessageStoreDefinition->getArgument(3));
 
@@ -2881,7 +2881,7 @@ public function testDoctrineOrmMessageStoreCanBeConfiguredWithCustomKey()
         $this->assertTrue($doctrineDbalDefaultMessageStoreDefinition->hasTag('ai.message_store'));
     }
 
-    public function testDoctrineOrmMessageStoreWithCustomTableNameCanBeConfiguredWithCustomKey()
+    public function testDoctrineDbalMessageStoreWithCustomTableNameCanBeConfiguredWithCustomKey()
     {
         $container = $this->buildContainer([
             'ai' => [
@@ -2903,7 +2903,7 @@ public function testDoctrineOrmMessageStoreWithCustomTableNameCanBeConfiguredWit
         $this->assertSame('default', (string) $doctrineDbalDefaultMessageStoreDefinition->getArgument(0));
         $this->assertSame('foo', (string) $doctrineDbalDefaultMessageStoreDefinition->getArgument(1));
         $this->assertInstanceOf(Reference::class, $doctrineDbalDefaultMessageStoreDefinition->getArgument(2));
-        $this->assertSame('doctrine', (string) $doctrineDbalDefaultMessageStoreDefinition->getArgument(2));
+        $this->assertSame('doctrine.dbal.default_connection', (string) $doctrineDbalDefaultMessageStoreDefinition->getArgument(2));
         $this->assertInstanceOf(Reference::class, $doctrineDbalDefaultMessageStoreDefinition->getArgument(3));
         $this->assertSame('serializer', (string) $doctrineDbalDefaultMessageStoreDefinition->getArgument(3));
 

src/chat/tests/Bridge/Doctrine/DoctrineDbalMessageStoreTest.php

@@ -15,10 +15,9 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Doctrine\DBAL\Result;
+use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Schema\SQLiteSchemaManager;
-use Doctrine\DBAL\Schema\SqliteSchemaManager as LowestSqliteSchemaManager;
 use Doctrine\DBAL\Schema\Table;
 use PHPUnit\Framework\TestCase;
 use Symfony\AI\Chat\Bridge\Doctrine\DoctrineDbalMessageStore;
@@ -51,7 +50,7 @@ public function testMessageStoreTableCannotBeSetupIfItAlreadyExist()
         $schema = $this->createMock(Schema::class);
         $schema->expects($this->once())->method('hasTable')->willReturn(true);
 
-        $sqliteSchemaManager = $this->createMock(class_exists(LowestSqliteSchemaManager::class) ? LowestSqliteSchemaManager::class : SQLiteSchemaManager::class);
+        $sqliteSchemaManager = $this->createMock(AbstractSchemaManager::class);
         $sqliteSchemaManager->expects($this->once())->method('introspectSchema')->willReturn($schema);
 
         $connection = $this->createMock(Connection::class);
@@ -79,7 +78,7 @@ public function testMessageStoreTableCanBeSetup()
         $schema->expects($this->once())->method('createTable')->with('foo')->willReturn($table);
         $schema->expects($this->once())->method('toSql')->with($platform)->willReturn([]);
 
-        $sqliteSchemaManager = $this->createMock(class_exists(LowestSqliteSchemaManager::class) ? LowestSqliteSchemaManager::class : SQLiteSchemaManager::class);
+        $sqliteSchemaManager = $this->createMock(AbstractSchemaManager::class);
         $sqliteSchemaManager->expects($this->once())->method('introspectSchema')->willReturn($schema);
 
         $connection = $this->createMock(Connection::class);
@@ -98,7 +97,7 @@ public function testMessageStoreTableCannotBeDroppedIfTableDoesNotExist()
         $schema = $this->createMock(Schema::class);
         $schema->expects($this->once())->method('hasTable')->willReturn(false);
 
-        $sqliteSchemaManager = $this->createMock(class_exists(LowestSqliteSchemaManager::class) ? LowestSqliteSchemaManager::class : SQLiteSchemaManager::class);
+        $sqliteSchemaManager = $this->createMock(AbstractSchemaManager::class);
         $sqliteSchemaManager->expects($this->once())->method('introspectSchema')->willReturn($schema);
 
         $connection = $this->createMock(Connection::class);
@@ -118,7 +117,7 @@ public function testMessageStoreTableCanBeDropped()
         $schema = $this->createMock(Schema::class);
         $schema->expects($this->once())->method('hasTable')->willReturn(true);
 
-        $sqliteSchemaManager = $this->createMock(class_exists(LowestSqliteSchemaManager::class) ? LowestSqliteSchemaManager::class : SQLiteSchemaManager::class);
+        $sqliteSchemaManager = $this->createMock(AbstractSchemaManager::class);
         $sqliteSchemaManager->expects($this->once())->method('introspectSchema')->willReturn($schema);
 
         $connection = $this->createMock(Connection::class);