Skip to content

[FrameworkBundle] Finish incomplete tests for lock & semaphore config #58250

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
Sep 16, 2024
Merged

[FrameworkBundle] Finish incomplete tests for lock & semaphore config #58250

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
9 changes: 9 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/lock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

$container->loadFromExtension('framework', [
'annotations' => false,
'http_method_override' => false,
'handle_all_throwables' => true,
'php_errors' => ['log' => true],
'lock' => null,
]);
16 changes: 16 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
@@ -0,0 +1,16 @@
<?php

$container->setParameter('env(REDIS_DSN)', 'redis://paas.com');

$container->loadFromExtension('framework', [
'annotations' => false,
'http_method_override' => false,
'handle_all_throwables' => true,
'php_errors' => ['log' => true],
'lock' => [
'foo' => 'semaphore',
'bar' => 'flock',
'baz' => ['semaphore', 'flock'],
'qux' => '%env(REDIS_DSN)%',
],
]);
9 changes: 9 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/semaphore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

$container->loadFromExtension('framework', [
'annotations' => false,
'http_method_override' => false,
'handle_all_throwables' => true,
'php_errors' => ['log' => true],
'semaphore' => 'redis://localhost',
]);
14 changes: 14 additions & 0 deletions ...Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/semaphore_named.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

$container->setParameter('env(REDIS_DSN)', 'redis://paas.com');

$container->loadFromExtension('framework', [
'annotations' => false,
'http_method_override' => false,
'handle_all_throwables' => true,
'php_errors' => ['log' => true],
'semaphore' => [
'foo' => 'redis://paas.com',
'qux' => '%env(REDIS_DSN)%',
],
]);
4 changes: 3 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<framework:config http-method-override="false" handle-all-throwables="true">
<framework:annotations enabled="false" />
<framework:php-errors log="true" />
<framework:lock/>
<framework:lock>
<framework:resource>semaphore</framework:resource>
</framework:lock>
</framework:config>
</container>
3 changes: 1 addition & 2 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 @@ -5,7 +5,6 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">


<parameters>
<parameter key="env(REDIS_URL)">redis://paas.com</parameter>
</parameters>
Expand All @@ -18,7 +17,7 @@
<framework:resource name="bar">flock</framework:resource>
<framework:resource name="baz">semaphore</framework:resource>
<framework:resource name="baz">flock</framework:resource>
<framework:resource name="qux">%env(REDIS_URL)%</framework:resource>
<framework:resource name="qux">%env(REDIS_DSN)%</framework:resource>
</framework:lock>
</framework:config>
</container>
4 changes: 3 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/semaphore.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<framework:config http-method-override="false" handle-all-throwables="true">
<framework:annotations enabled="false" />
<framework:php-errors log="true" />
<framework:semaphore/>
<framework:semaphore>
<framework:resource>redis://localhost</framework:resource>
</framework:semaphore>
</framework:config>
</container>
16 changes: 16 additions & 0 deletions ...Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/semaphore_named.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config http-method-override="false" handle-all-throwables="true">
<framework:annotations enabled="false" />
<framework:php-errors log="true" />
<framework:semaphore>
<framework:resource name="foo">redis://paas.com</framework:resource>
<framework:resource name="qux">%env(REDIS_DSN)%</framework:resource>
</framework:semaphore>
</framework:config>
</container>
56 changes: 56 additions & 0 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 @@ -2396,6 +2396,62 @@ public function testAssetMapperWithoutAssets()
$this->assertFalse($container->has('assets._default_package'));
}

public function testDefaultLock()
{
$container = $this->createContainerFromFile('lock');

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

public function testNamedLocks()
{
$container = $this->createContainerFromFile('lock_named');

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::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::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::assertTrue($container->hasDefinition('lock.qux.factory'));
$storeDef = $container->getDefinition($container->getDefinition('lock.qux.factory')->getArgument(0));
self::assertStringContainsString('REDIS_DSN', $storeDef->getArgument(0));
}

public function testDefaultSemaphore()
{
$container = $this->createContainerFromFile('semaphore');

self::assertTrue($container->hasDefinition('semaphore.default.factory'));
$storeDef = $container->getDefinition($container->getDefinition('semaphore.default.factory')->getArgument(0));
self::assertSame('redis://localhost', $storeDef->getArgument(0));
}

public function testNamedSemaphores()
{
$container = $this->createContainerFromFile('semaphore_named');

self::assertTrue($container->hasDefinition('semaphore.foo.factory'));
$storeDef = $container->getDefinition($container->getDefinition('semaphore.foo.factory')->getArgument(0));
self::assertSame('redis://paas.com', $storeDef->getArgument(0));

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

protected function createContainer(array $data = [])
{
return new ContainerBuilder(new EnvPlaceholderParameterBag(array_merge([
Expand Down
Loading