Skip to content

[FrameworkBundle][Lock] Fix certain DSNs identified as service IDs #58445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2024
Merged

[FrameworkBundle][Lock] Fix certain DSNs identified as service IDs #58445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2008,7 +2008,7 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
$storeDefinitions = [];
foreach ($resourceStores as $resourceStore) {
$storeDsn = $container->resolveEnvPlaceholders($resourceStore, null, $usedEnvs);
if (!$usedEnvs && !str_contains($resourceStore, '://')) {
if (!$usedEnvs && !str_contains($resourceStore, ':') && !\in_array($resourceStore, ['flock', 'semaphore', 'in-memory'], true)) {
$resourceStore = new Reference($resourceStore);
}
$storeDefinition = new Definition(PersistingStoreInterface::class);
Expand Down
2 changes: 2 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/lock_named.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,7 @@
'bar' => 'flock',
'baz' => ['semaphore', 'flock'],
'qux' => '%env(REDIS_DSN)%',
'corge' => 'in-memory',
'grault' => 'mysql:host=localhost;dbname=test',
],
]);
2 changes: 2 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock_named.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
<framework:resource name="baz">semaphore</framework:resource>
<framework:resource name="baz">flock</framework:resource>
<framework:resource name="qux">%env(REDIS_DSN)%</framework:resource>
<framework:resource name="corge">in-memory</framework:resource>
<framework:resource name="grault">mysql:host=localhost;dbname=test</framework:resource>
</framework:lock>
</framework:config>
</container>
2 changes: 2 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/lock_named.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ framework:
bar: flock
baz: [semaphore, flock]
qux: "%env(REDIS_DSN)%"
corge: in-memory
grault: mysql:host=localhost;dbname=test
20 changes: 14 additions & 6 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2423,9 +2423,9 @@ public function testDefaultLock()
$storeDef = $container->getDefinition($container->getDefinition('lock.default.factory')->getArgument(0));

if (class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported()) {
self::assertEquals(new Reference('semaphore'), $storeDef->getArgument(0));
self::assertSame('semaphore', $storeDef->getArgument(0));
} else {
self::assertEquals(new Reference('flock'), $storeDef->getArgument(0));
self::assertSame('flock', $storeDef->getArgument(0));
}
}

Expand All @@ -2435,23 +2435,31 @@ public function testNamedLocks()

self::assertTrue($container->hasDefinition('lock.foo.factory'));
$storeDef = $container->getDefinition($container->getDefinition('lock.foo.factory')->getArgument(0));
self::assertEquals(new Reference('semaphore'), $storeDef->getArgument(0));
self::assertSame('semaphore', $storeDef->getArgument(0));

self::assertTrue($container->hasDefinition('lock.bar.factory'));
$storeDef = $container->getDefinition($container->getDefinition('lock.bar.factory')->getArgument(0));
self::assertEquals(new Reference('flock'), $storeDef->getArgument(0));
self::assertSame('flock', $storeDef->getArgument(0));

self::assertTrue($container->hasDefinition('lock.baz.factory'));
$storeDef = $container->getDefinition($container->getDefinition('lock.baz.factory')->getArgument(0));
self::assertIsArray($storeDefArg = $storeDef->getArgument(0));
$storeDef1 = $container->getDefinition($storeDefArg[0]);
$storeDef2 = $container->getDefinition($storeDefArg[1]);
self::assertEquals(new Reference('semaphore'), $storeDef1->getArgument(0));
self::assertEquals(new Reference('flock'), $storeDef2->getArgument(0));
self::assertSame('semaphore', $storeDef1->getArgument(0));
self::assertSame('flock', $storeDef2->getArgument(0));

self::assertTrue($container->hasDefinition('lock.qux.factory'));
$storeDef = $container->getDefinition($container->getDefinition('lock.qux.factory')->getArgument(0));
self::assertStringContainsString('REDIS_DSN', $storeDef->getArgument(0));

self::assertTrue($container->hasDefinition('lock.corge.factory'));
$storeDef = $container->getDefinition($container->getDefinition('lock.corge.factory')->getArgument(0));
self::assertSame('in-memory', $storeDef->getArgument(0));

self::assertTrue($container->hasDefinition('lock.grault.factory'));
$storeDef = $container->getDefinition($container->getDefinition('lock.grault.factory')->getArgument(0));
self::assertSame('mysql:host=localhost;dbname=test', $storeDef->getArgument(0));
}

public function testLockWithService()
Expand Down