Revert "[DoctrineBridge] Ignore invalid stores in `LockStoreSchemaLis…

…tener` raised by `StoreFactory`" This reverts commit 0acd403.
symfony · barton-webwings · Mar 27, 2024 · Apr 12, 2024 · Apr 12, 2024 · Apr 12, 2024
commit d6b4d8465543b0587093b7de81bc0a0dad379a73
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaListener.php b/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaListener.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bridge\Doctrine\SchemaListener;

 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
-use Symfony\Component\Lock\Exception\InvalidArgumentException;
 use Symfony\Component\Lock\PersistingStoreInterface;
 use Symfony\Component\Lock\Store\DoctrineDbalStore;

@@ -30,20 +29,12 @@ public function postGenerateSchema(GenerateSchemaEventArgs $event): void
    {
        $connection = $event->getEntityManager()->getConnection();

-        $storesIterator = new \ArrayIterator($this->stores);
-        while ($storesIterator->valid()) {
-            try {
-                $store = $storesIterator->current();
-                if (!$store instanceof DoctrineDbalStore) {
-                    continue;
-                }
-
-                $store->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));
-            } catch (InvalidArgumentException) {
-                // no-op
+        foreach ($this->stores as $store) {
+            if (!$store instanceof DoctrineDbalStore) {
+                continue;
            }

-            $storesIterator->next();
+            $store->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));
        }
    }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/LockStoreSchemaListenerTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/LockStoreSchemaListenerTest.php
@@ -17,7 +17,6 @@
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\SchemaListener\LockStoreSchemaListener;
-use Symfony\Component\Lock\Exception\InvalidArgumentException;
 use Symfony\Component\Lock\Store\DoctrineDbalStore;

 class LockStoreSchemaListenerTest extends TestCase
@@ -40,20 +39,4 @@ public function testPostGenerateSchemaLockPdo()
        $subscriber = new LockStoreSchemaListener([$lockStore]);
        $subscriber->postGenerateSchema($event);
    }
-
-    public function testPostGenerateSchemaWithInvalidLockStore()
-    {
-        $entityManager = $this->createMock(EntityManagerInterface::class);
-        $entityManager->expects($this->once())
-            ->method('getConnection')
-            ->willReturn($this->createMock(Connection::class));
-        $event = new GenerateSchemaEventArgs($entityManager, new Schema());
-
-        $subscriber = new LockStoreSchemaListener((static function (): \Generator {
-            yield $this->createMock(DoctrineDbalStore::class);
-
-            throw new InvalidArgumentException('Unsupported Connection');
-        })());
-        $subscriber->postGenerateSchema($event);
-    }
 }