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 69e306c

Browse filesBrowse files
committed
Merge branch '6.4' into 7.1
* 6.4: fix functional tests fix merge fix XSD to allow to configure locks without resources
2 parents 0e6c77a + f40274b commit 69e306c
Copy full SHA for 69e306c

File tree

Expand file treeCollapse file tree

3 files changed

+9
-5
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+9
-5
lines changed

‎Resources/config/schema/symfony-1.0.xsd

Copy file name to clipboardExpand all lines: Resources/config/schema/symfony-1.0.xsd
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@
531531

532532
<xsd:complexType name="lock">
533533
<xsd:sequence>
534-
<xsd:element name="resource" type="lock_resource" minOccurs="1" maxOccurs="unbounded" />
534+
<xsd:element name="resource" type="lock_resource" minOccurs="0" maxOccurs="unbounded" />
535535
</xsd:sequence>
536536
<xsd:attribute name="enabled" type="xsd:boolean" />
537537
</xsd:complexType>

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

Copy file name to clipboardExpand all lines: Tests/DependencyInjection/Fixtures/xml/lock.xml
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
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>
12-
<framework:resource>semaphore</framework:resource>
13-
</framework:lock>
11+
<framework:lock />
1412
</framework:config>
1513
</container>

‎Tests/DependencyInjection/FrameworkExtensionTestCase.php

Copy file name to clipboardExpand all lines: Tests/DependencyInjection/FrameworkExtensionTestCase.php
+7-1Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
use Symfony\Component\HttpFoundation\IpUtils;
5757
use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
5858
use Symfony\Component\HttpKernel\Fragment\FragmentUriGeneratorInterface;
59+
use Symfony\Component\Lock\Store\SemaphoreStore;
5960
use Symfony\Component\Messenger\Bridge\AmazonSqs\Transport\AmazonSqsTransportFactory;
6061
use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpTransportFactory;
6162
use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\BeanstalkdTransportFactory;
@@ -2392,7 +2393,12 @@ public function testDefaultLock()
23922393

23932394
self::assertTrue($container->hasDefinition('lock.default.factory'));
23942395
$storeDef = $container->getDefinition($container->getDefinition('lock.default.factory')->getArgument(0));
2395-
self::assertEquals(new Reference('semaphore'), $storeDef->getArgument(0));
2396+
2397+
if (class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported()) {
2398+
self::assertEquals(new Reference('semaphore'), $storeDef->getArgument(0));
2399+
} else {
2400+
self::assertEquals(new Reference('flock'), $storeDef->getArgument(0));
2401+
}
23962402
}
23972403

23982404
public function testNamedLocks()

0 commit comments

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