Skip to content

Commit 2f1b7a7

Browse files
HypeMCHypeMC
committed
[FrameworkBundle] Fix schema & finish incomplete tests for lock & semaphore config
1 parent 6cbdb0c commit 2f1b7a7

File tree

9 files changed

+127
-4
lines changed

9 files changed

+127
-4
lines changed

‎Tests/DependencyInjection/Fixtures/php/lock.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', [
4+
'annotations' => false,
5+
'http_method_override' => false,
6+
'handle_all_throwables' => true,
7+
'php_errors' => ['log' => true],
8+
'lock' => null,
9+
]);

‎Tests/DependencyInjection/Fixtures/php/lock_named.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
$container->setParameter('env(REDIS_DSN)', 'redis://paas.com');
4+
5+
$container->loadFromExtension('framework', [
6+
'annotations' => false,
7+
'http_method_override' => false,
8+
'handle_all_throwables' => true,
9+
'php_errors' => ['log' => true],
10+
'lock' => [
11+
'foo' => 'semaphore',
12+
'bar' => 'flock',
13+
'baz' => ['semaphore', 'flock'],
14+
'qux' => '%env(REDIS_DSN)%',
15+
],
16+
]);

‎Tests/DependencyInjection/Fixtures/php/semaphore.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', [
4+
'annotations' => false,
5+
'http_method_override' => false,
6+
'handle_all_throwables' => true,
7+
'php_errors' => ['log' => true],
8+
'semaphore' => 'redis://localhost',
9+
]);

‎Tests/DependencyInjection/Fixtures/php/semaphore_named.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
$container->setParameter('env(REDIS_DSN)', 'redis://paas.com');
4+
5+
$container->loadFromExtension('framework', [
6+
'annotations' => false,
7+
'http_method_override' => false,
8+
'handle_all_throwables' => true,
9+
'php_errors' => ['log' => true],
10+
'semaphore' => [
11+
'foo' => 'redis://paas.com',
12+
'qux' => '%env(REDIS_DSN)%',
13+
],
14+
]);

‎Tests/DependencyInjection/Fixtures/xml/lock.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<framework:config http-method-override="false" handle-all-throwables="true">
99
<framework:annotations enabled="false" />
1010
<framework:php-errors log="true" />
11-
<framework:lock/>
11+
<framework:lock>
12+
<framework:resource>semaphore</framework:resource>
13+
</framework:lock>
1214
</framework:config>
1315
</container>

‎Tests/DependencyInjection/Fixtures/xml/lock_named.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
66
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
77

8-
98
<parameters>
109
<parameter key="env(REDIS_URL)">redis://paas.com</parameter>
1110
</parameters>
@@ -18,7 +17,7 @@
1817
<framework:resource name="bar">flock</framework:resource>
1918
<framework:resource name="baz">semaphore</framework:resource>
2019
<framework:resource name="baz">flock</framework:resource>
21-
<framework:resource name="qux">%env(REDIS_URL)%</framework:resource>
20+
<framework:resource name="qux">%env(REDIS_DSN)%</framework:resource>
2221
</framework:lock>
2322
</framework:config>
2423
</container>

‎Tests/DependencyInjection/Fixtures/xml/semaphore.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<framework:config http-method-override="false" handle-all-throwables="true">
99
<framework:annotations enabled="false" />
1010
<framework:php-errors log="true" />
11-
<framework:semaphore/>
11+
<framework:semaphore>
12+
<framework:resource>redis://localhost</framework:resource>
13+
</framework:semaphore>
1214
</framework:config>
1315
</container>

‎Tests/DependencyInjection/Fixtures/xml/semaphore_named.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" ?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:framework="http://symfony.com/schema/dic/symfony"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
6+
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
7+
8+
<framework:config http-method-override="false" handle-all-throwables="true">
9+
<framework:annotations enabled="false" />
10+
<framework:php-errors log="true" />
11+
<framework:semaphore>
12+
<framework:resource name="foo">redis://paas.com</framework:resource>
13+
<framework:resource name="qux">%env(REDIS_DSN)%</framework:resource>
14+
</framework:semaphore>
15+
</framework:config>
16+
</container>

‎Tests/DependencyInjection/FrameworkExtensionTestCase.php‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2396,6 +2396,62 @@ public function testAssetMapperWithoutAssets()
23962396
$this->assertFalse($container->has('assets._default_package'));
23972397
}
23982398

2399+
public function testDefaultLock()
2400+
{
2401+
$container = $this->createContainerFromFile('lock');
2402+
2403+
self::assertTrue($container->hasDefinition('lock.default.factory'));
2404+
$storeDef = $container->getDefinition($container->getDefinition('lock.default.factory')->getArgument(0));
2405+
self::assertEquals(new Reference('semaphore'), $storeDef->getArgument(0));
2406+
}
2407+
2408+
public function testNamedLocks()
2409+
{
2410+
$container = $this->createContainerFromFile('lock_named');
2411+
2412+
self::assertTrue($container->hasDefinition('lock.foo.factory'));
2413+
$storeDef = $container->getDefinition($container->getDefinition('lock.foo.factory')->getArgument(0));
2414+
self::assertEquals(new Reference('semaphore'), $storeDef->getArgument(0));
2415+
2416+
self::assertTrue($container->hasDefinition('lock.bar.factory'));
2417+
$storeDef = $container->getDefinition($container->getDefinition('lock.bar.factory')->getArgument(0));
2418+
self::assertEquals(new Reference('flock'), $storeDef->getArgument(0));
2419+
2420+
self::assertTrue($container->hasDefinition('lock.baz.factory'));
2421+
$storeDef = $container->getDefinition($container->getDefinition('lock.baz.factory')->getArgument(0));
2422+
self::assertIsArray($storeDefArg = $storeDef->getArgument(0));
2423+
$storeDef1 = $container->getDefinition($storeDefArg[0]);
2424+
$storeDef2 = $container->getDefinition($storeDefArg[1]);
2425+
self::assertEquals(new Reference('semaphore'), $storeDef1->getArgument(0));
2426+
self::assertEquals(new Reference('flock'), $storeDef2->getArgument(0));
2427+
2428+
self::assertTrue($container->hasDefinition('lock.qux.factory'));
2429+
$storeDef = $container->getDefinition($container->getDefinition('lock.qux.factory')->getArgument(0));
2430+
self::assertStringContainsString('REDIS_DSN', $storeDef->getArgument(0));
2431+
}
2432+
2433+
public function testDefaultSemaphore()
2434+
{
2435+
$container = $this->createContainerFromFile('semaphore');
2436+
2437+
self::assertTrue($container->hasDefinition('semaphore.default.factory'));
2438+
$storeDef = $container->getDefinition($container->getDefinition('semaphore.default.factory')->getArgument(0));
2439+
self::assertSame('redis://localhost', $storeDef->getArgument(0));
2440+
}
2441+
2442+
public function testNamedSemaphores()
2443+
{
2444+
$container = $this->createContainerFromFile('semaphore_named');
2445+
2446+
self::assertTrue($container->hasDefinition('semaphore.foo.factory'));
2447+
$storeDef = $container->getDefinition($container->getDefinition('semaphore.foo.factory')->getArgument(0));
2448+
self::assertSame('redis://paas.com', $storeDef->getArgument(0));
2449+
2450+
self::assertTrue($container->hasDefinition('semaphore.qux.factory'));
2451+
$storeDef = $container->getDefinition($container->getDefinition('semaphore.qux.factory')->getArgument(0));
2452+
self::assertStringContainsString('REDIS_DSN', $storeDef->getArgument(0));
2453+
}
2454+
23992455
protected function createContainer(array $data = [])
24002456
{
24012457
return new ContainerBuilder(new EnvPlaceholderParameterBag(array_merge([

0 commit comments

Comments
 (0)