From db070a16761c02ddccd21f4592045f85c26e8e50 Mon Sep 17 00:00:00 2001 From: matlec Date: Thu, 8 Aug 2024 12:56:51 +0200 Subject: [PATCH] [DoctrineBridge] Fix the `LockStoreSchemaListener` --- .../LockStoreSchemaListener.php | 17 ++++------------- .../LockStoreSchemaListenerTest.php | 19 +------------------ 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaListener.php b/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaListener.php index a85d159df837b..c4c3b0b7ffcad 100644 --- 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 index 6f23d680feb9f..6fd86a46c84e5 100644 --- 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 @@ -37,23 +36,7 @@ public function testPostGenerateSchemaLockPdo() ->method('configureSchema') ->with($schema, fn () => true); - $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 = new LockStoreSchemaListener((static fn () => yield $lockStore)()); $subscriber->postGenerateSchema($event); } } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy