8000 Merge branch '6.4' into 7.1 · symfony/symfony@180f389 · GitHub
[go: up one dir, main page]
Skip to content

Commit 180f389

Browse files
xabbuhxabbuh
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 6ce42d9 + ae68ff3 commit 180f389

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

‎.github/workflows/integration-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ jobs:
136136
php_server
137137
}
138138
139+
root * /symfony/src/Symfony/Component/HttpFoundation/Tests/Fixtures/response-functional/
140+
139141
steps:
140142
- name: Checkout
141143
uses: actions/checkout@v4

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines 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>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock.xml

Lines 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>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
use Symfony\Component\HttpFoundation\IpUtils;
5757
ACD5 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