Add framework config for DBAL cache adapter

Author: GromNaN

SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php

@@ -14,7 +14,7 @@
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 use Doctrine\ORM\Tools\ToolEvents;
-use Symfony\Component\Cache\Adapter\DoctrineSchemaConfiguratorInterface;
+use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter;
 
 /**
  * Automatically adds the cache table needed for the DoctrineDbalAdapter of
@@ -27,7 +27,7 @@ final class DoctrineDbalCacheAdapterSchemaSubscriber implements EventSubscriber
     private $dbalAdapters;
 
     /**
-     * @param iterable<mixed, DoctrineSchemaConfiguratorInterface> $dbalAdapters
+     * @param iterable<mixed, DoctrineDbalAdapter> $dbalAdapters
      */
     public function __construct(iterable $dbalAdapters)
     {

SchemaListener/PdoCacheAdapterDoctrineSchemaSubscriber.php

@@ -16,8 +16,6 @@
 use Doctrine\ORM\Tools\ToolEvents;
 use Symfony\Component\Cache\Adapter\PdoAdapter;
 
-trigger_deprecation('symfony/doctrine-bridge', '5.4', 'The "%s" class is deprecated, use "%s" instead.', PdoCacheAdapterDoctrineSchemaSubscriber::class, DoctrineDbalCacheAdapterSchemaSubscriber::class);
-
 /**
  * Automatically adds the cache table needed for the PdoAdapter.
  *
@@ -41,6 +39,10 @@ public function postGenerateSchema(GenerateSchemaEventArgs $event): void
     {
         $dbalConnection = $event->getEntityManager()->getConnection();
         foreach ($this->pdoAdapters as $pdoAdapter) {
+            if (PdoAdapter::class !== \get_class($pdoAdapter)) {
+                trigger_deprecation('symfony/doctrine-bridge', '5.4', 'The "%s" class is deprecated, use "%s" instead.', self::class, DoctrineDbalCacheAdapterSchemaSubscriber::class);
+            }
+
             $pdoAdapter->configureSchema($event->getSchema(), $dbalConnection);
         }
     }

Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php

@@ -17,7 +17,7 @@
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\SchemaListener\DoctrineDbalCacheAdapterSchemaSubscriber;
-use Symfony\Component\Cache\Adapter\DoctrineSchemaConfiguratorInterface;
+use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter;
 
 class DoctrineDbalCacheAdapterSchemaSubscriberTest extends TestCase
 {
@@ -29,14 +29,15 @@ public function testPostGenerateSchema()
         $entityManager->expects($this->once())
             ->method('getConnection')
             ->willReturn($dbalConnection);
+
         $event = new GenerateSchemaEventArgs($entityManager, $schema);
 
-        $pdoAdapter = $this->createMock(DoctrineSchemaConfiguratorInterface::class);
-        $pdoAdapter->expects($this->once())
+        $dbalAdapter = $this->createMock(DoctrineDbalAdapter::class);
+        $dbalAdapter->expects($this->once())
             ->method('configureSchema')
             ->with($schema, $dbalConnection);
 
-        $subscriber = new DoctrineDbalCacheAdapterSchemaSubscriber([$pdoAdapter]);
+        $subscriber = new DoctrineDbalCacheAdapterSchemaSubscriber([$dbalAdapter]);
         $subscriber->postGenerateSchema($event);
     }
 }

Tests/SchemaListener/PdoCacheAdapterDoctrineSchemaSubscriberTest.php

@@ -17,27 +17,33 @@
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\SchemaListener\PdoCacheAdapterDoctrineSchemaSubscriber;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Cache\Adapter\PdoAdapter;
 
 /**
  * @group legacy
  */
 class PdoCacheAdapterDoctrineSchemaSubscriberTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     public function testPostGenerateSchema()
     {
         $schema = new Schema();
         $dbalConnection = $this->createMock(Connection::class);
         $entityManager = $this->createMock(EntityManagerInterface::class);
-        $entityManager->expects($this->once())
+        $entityManager->expects($this->any())
             ->method('getConnection')
             ->willReturn($dbalConnection);
+
         $event = new GenerateSchemaEventArgs($entityManager, $schema);
 
         $pdoAdapter = $this->createMock(PdoAdapter::class);
         $pdoAdapter->expects($this->once())
             ->method('configureSchema')
-            ->with($schema, $dbalConnection);
+            ->with($event->getSchema(), $event->getEntityManager()->getConnection());
+
+        $this->expectDeprecation('Since symfony/doctrine-bridge 5.4: The "Symfony\Bridge\Doctrine\SchemaListener\PdoCacheAdapterDoctrineSchemaSubscriber" class is deprecated, use "Symfony\Bridge\Doctrine\SchemaListener\DoctrineDbalCacheAdapterSchemaSubscriber" instead.');
 
         $subscriber = new PdoCacheAdapterDoctrineSchemaSubscriber([$pdoAdapter]);
         $subscriber->postGenerateSchema($event);