Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commitd5f7171

Browse files
bug#57944 [DoctrineBridge] Fix theLockStoreSchemaListener (MatTheCat)
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`
2 parents73d8b75 +db070a1 commitd5f7171

File tree

2 files changed

+5
-31
lines changed

2 files changed

+5
-31
lines changed

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespaceSymfony\Bridge\Doctrine\SchemaListener;
1313

1414
useDoctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
15-
useSymfony\Component\Lock\Exception\InvalidArgumentException;
1615
useSymfony\Component\Lock\PersistingStoreInterface;
1716
useSymfony\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 (!$storeinstanceof DoctrineDbalStore) {
38-
continue;
39-
}
40-
41-
$store->configureSchema($event->getSchema(),$this->getIsSameDatabaseChecker($connection));
42-
}catch (InvalidArgumentException) {
43-
// no-op
32+
foreach ($this->storesas$store) {
33+
if (!$storeinstanceof 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‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
useDoctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
1818
usePHPUnit\Framework\TestCase;
1919
useSymfony\Bridge\Doctrine\SchemaListener\LockStoreSchemaListener;
20-
useSymfony\Component\Lock\Exception\InvalidArgumentException;
2120
useSymfony\Component\Lock\Store\DoctrineDbalStore;
2221

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

40-
$subscriber =newLockStoreSchemaListener([$lockStore]);
41-
$subscriber->postGenerateSchema($event);
42-
}
43-
44-
publicfunctiontestPostGenerateSchemaWithInvalidLockStore()
45-
{
46-
$entityManager =$this->createMock(EntityManagerInterface::class);
47-
$entityManager->expects($this->once())
48-
->method('getConnection')
49-
->willReturn($this->createMock(Connection::class));
50-
$event =newGenerateSchemaEventArgs($entityManager,newSchema());
51-
52-
$subscriber =newLockStoreSchemaListener((staticfunction ():\Generator {
53-
yield$this->createMock(DoctrineDbalStore::class);
54-
55-
thrownewInvalidArgumentException('Unsupported Connection');
56-
})());
39+
$subscriber =newLockStoreSchemaListener((staticfn () =>yield$lockStore)());
5740
$subscriber->postGenerateSchema($event);
5841
}
5942
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp