Skip to content

Commit bb4c882

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: fix lowest deps synchronize RelayProxy [Form] Adding more `@var` PHPDoc's to silence psalm [Validator] added missing Hungarian translation [Validator] add missing lv translation fix the exception being thrown fix syntax error fix redis messenger scheme comparison [Scheduler] Separate id and description in message providers [Form] Adding `@var` PHPDoc to silence psalm append instead of replacing potentially non-existent named-arguments [Validator] added missing Polish translation add translations for the MacAddress constraint remove invalid changelog entry Added missing Serbian (sr_Latn) translations [Cache][DependencyInjection][Lock][Mailer][Messenger][Notifier][Translation] Url decode username and passwords from `parse_url()` results [Security] added missing Albanian translations [Validator] Add missing Hungarian translation [Serializer] Fix using deserialization path [Validator] Add missing hr translation
2 parents c647b01 + a1313b7 commit bb4c882

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2776,27 +2776,27 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
27762776

27772777
if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', NotifierBridge\Mercure\MercureTransportFactory::class, $parentPackages) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages) && \in_array(MercureBundle::class, $container->getParameter('kernel.bundles'), true)) {
27782778
$container->getDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class])
2779-
->replaceArgument('$registry', new Reference(HubRegistry::class))
2780-
->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
2781-
->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
2779+
->replaceArgument(0, new Reference(HubRegistry::class))
2780+
->replaceArgument(1, new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
2781+
->addArgument(new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
27822782
} elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', NotifierBridge\Mercure\MercureTransportFactory::class, $parentPackages)) {
27832783
$container->removeDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class]);
27842784
}
27852785

27862786
if (ContainerBuilder::willBeAvailable('symfony/fake-chat-notifier', NotifierBridge\FakeChat\FakeChatTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
27872787
$container->getDefinition($classToServices[NotifierBridge\FakeChat\FakeChatTransportFactory::class])
2788-
->replaceArgument('$mailer', new Reference('mailer'))
2789-
->replaceArgument('$logger', new Reference('logger'))
2790-
->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
2791-
->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
2788+
->replaceArgument(0, new Reference('mailer'))
2789+
->replaceArgument(1, new Reference('logger'))
2790+
->addArgument(new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
2791+
->addArgument(new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
27922792
}
27932793

27942794
if (ContainerBuilder::willBeAvailable('symfony/fake-sms-notifier', NotifierBridge\FakeSms\FakeSmsTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
27952795
$container->getDefinition($classToServices[NotifierBridge\FakeSms\FakeSmsTransportFactory::class])
2796-
->replaceArgument('$mailer', new Reference('mailer'))
2797-
->replaceArgument('$logger', new Reference('logger'))
2798-
->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
2799-
->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
2796+
->replaceArgument(0, new Reference('mailer'))
2797+
->replaceArgument(1, new Reference('logger'))
2798+
->addArgument(new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
2799+
->addArgument(new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
28002800
}
28012801

28022802
if (isset($config['admin_recipients'])) {

Tests/Fixtures/Messenger/DummyTask.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
#[AsCronTask(expression: '0 * * * *', timezone: 'Europe/Berlin', arguments: ['2'], schedule: 'dummy_task', method: 'method2')]
1010
#[AsPeriodicTask(frequency: 5, arguments: [3], schedule: 'dummy_task')]
1111
#[AsPeriodicTask(frequency: '1 day', from: '2023-10-25 09:59:00Z', jitter: 60, arguments: ['4'], schedule: 'dummy_task', method: 'method4')]
12+
#[AsPeriodicTask(frequency: '1 day', from: '2023-10-25 09:59:00Z', arguments: ['9'], schedule: 'dummy_task', method: 'method5')]
13+
#[AsPeriodicTask(frequency: '1 day', from: '2023-10-25 09:59:00Z', arguments: ['9b'], schedule: 'dummy_task', method: 'method5')]
14+
#[AsPeriodicTask(frequency: '1 day', from: '2023-10-25 09:59:00Z', arguments: ['named' => '9'], schedule: 'dummy_task', method: 'method5')]
1215
class DummyTask
1316
{
1417
public static array $calls = [];

Tests/Functional/SchedulerTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ public function testAutoconfiguredScheduler()
8484
$this->assertCount(779, $calls['__invoke']);
8585
$this->assertSame([['2']], $calls['method2']);
8686
$this->assertSame([['4']], $calls['method4']);
87+
$this->assertSame([['9'], ['9b'], ['named' => '9']], $calls['method5']);
8788
$this->assertSame([['5', 6], ['7', 8]], $calls['attributesOnMethod']);
8889
}
8990

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"symfony/notifier": "^6.4|^7.0",
5757
"symfony/process": "^6.4|^7.0",
5858
"symfony/rate-limiter": "^6.4|^7.0",
59-
"symfony/scheduler": "^6.4|^7.0",
59+
"symfony/scheduler": "^6.4.3|^7.0.3",
6060
"symfony/security-bundle": "^6.4|^7.0",
6161
"symfony/semaphore": "^6.4|^7.0",
6262
"symfony/serializer": "^6.4|^7.0",
@@ -91,7 +91,7 @@
9191
"symfony/mime": "<6.4",
9292
"symfony/property-info": "<6.4",
9393
"symfony/property-access": "<6.4",
94-
"symfony/scheduler": "<6.4",
94+
"symfony/scheduler": "<6.4.3|>=7.0.0,<7.0.3",
9595
"symfony/serializer": "<6.4",
9696
"symfony/security-csrf": "<6.4",
9797
"symfony/security-core": "<6.4",

0 commit comments

Comments
 (0)