Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f356e02

Browse filesBrowse files
committed
Revert "bug symfony#50761 [DoctrineBridge] Ignore invalid stores in LockStoreSchemaListener raised by StoreFactory (alexandre-daubois)"
This reverts commit 69ef02e, reversing changes made to 04c7ccf.
1 parent 5cffe22 commit f356e02
Copy full SHA for f356e02

File tree

Expand file treeCollapse file tree

2 files changed

+8
-30
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+8
-30
lines changed

‎src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaListener.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaListener.php
+4-13Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bridge\Doctrine\SchemaListener;
1313

1414
use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
15-
use Symfony\Component\Lock\Exception\InvalidArgumentException;
1615
use Symfony\Component\Lock\PersistingStoreInterface;
1716
use Symfony\Component\Lock\Store\DoctrineDbalStore;
1817

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

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;
4435
}
4536

46-
$storesIterator->next();
37+
$store->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));
4738
}
4839
}
4940
}

‎src/Symfony/Bridge/Doctrine/Tests/SchemaListener/LockStoreSchemaListenerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/SchemaListener/LockStoreSchemaListenerTest.php
+4-17Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
1818
use PHPUnit\Framework\TestCase;
1919
use Symfony\Bridge\Doctrine\SchemaListener\LockStoreSchemaListener;
20-
use Symfony\Component\Lock\Exception\InvalidArgumentException;
2120
use Symfony\Component\Lock\Store\DoctrineDbalStore;
2221

2322
class LockStoreSchemaListenerTest extends TestCase
@@ -37,23 +36,11 @@ public function testPostGenerateSchemaLockPdo()
3736
->method('configureSchema')
3837
->with($schema, fn () => true);
3938

40-
$subscriber = new LockStoreSchemaListener([$lockStore]);
41-
$subscriber->postGenerateSchema($event);
42-
}
43-
44-
public function testPostGenerateSchemaWithInvalidLockStore()
45-
{
46-
$entityManager = $this->createMock(EntityManagerInterface::class);
47-
$entityManager->expects($this->once())
48-
->method('getConnection')
49-
->willReturn($this->createMock(Connection::class));
50-
$event = new GenerateSchemaEventArgs($entityManager, new Schema());
51-
52-
$subscriber = new LockStoreSchemaListener((static function (): \Generator {
53-
yield $this->createMock(DoctrineDbalStore::class);
39+
$iterator = (static function () use ($lockStore) {
40+
yield $lockStore;
41+
})();
5442

55-
throw new InvalidArgumentException('Unsupported Connection');
56-
})());
43+
$subscriber = new LockStoreSchemaListener($iterator);
5744
$subscriber->postGenerateSchema($event);
5845
}
5946
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.