bug #57944 [DoctrineBridge] Fix the LockStoreSchemaListener (MatTheCat)

nicolas-grekas · nicolas-grekas · commit d5f717117262 · 2024-08-13T12:11:54.000+02:00
This PR was squashed before being merged into the 6.4 branch. Discussion ---------- [DoctrineBridge] Fix the `LockStoreSchemaListener` | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #54406 | License | MIT #54407 got sidetracked ~and `@barton`-webwings seems no longer active on GitHub~ so this PR takes over. Commits ------- db070a1 [DoctrineBridge] Fix the `LockStoreSchemaListener`
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
@@ -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);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`namespace Symfony\Bridge\Doctrine\SchemaListener;`
`13`	`13`
`14`	`14`	`use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;`
`15`		`-use Symfony\Component\Lock\Exception\InvalidArgumentException;`
`16`	`15`	`use Symfony\Component\Lock\PersistingStoreInterface;`
`17`	`16`	`use Symfony\Component\Lock\Store\DoctrineDbalStore;`
`18`	`17`
`@@ -30,20 +29,12 @@ public function postGenerateSchema(GenerateSchemaEventArgs $event): void`
`30`	`29`	`{`
`31`	`30`	`$connection = $event->getEntityManager()->getConnection();`
`32`	`31`
`33`		`- $storesIterator = new \ArrayIterator($this->stores);`
`34`		`- while ($storesIterator->valid()) {`
`35`		`- try {`
`36`		`- $store = $storesIterator->current();`
`37`		`- if (!$store instanceof DoctrineDbalStore) {`
`38`		`- continue;`
`39`		`- }`
`40`		`-`
`41`		`- $store->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));`
`42`		`- } catch (InvalidArgumentException) {`
`43`		`- // no-op`
	`32`	`+ foreach ($this->stores as $store) {`
	`33`	`+ if (!$store instanceof DoctrineDbalStore) {`
	`34`	`+ continue;`
`44`	`35`	`}`
`45`	`36`
`46`		`- $storesIterator->next();`
	`37`	`+ $store->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));`
`47`	`38`	`}`
`48`	`39`	`}`
`49`	`40`	`}`