Skip to content

Commit 28c6718

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: Fix enabled key for ratelimiter config Use more explicit variable name Fix wrong comment about SES region [Mailer] [Sendgrid] Use $scheme variable to stay consistent [Mailer] [Amazon] Fix @param annotation [Mailer] Rename testsuites Remove void return type from test methods Remove void return type from test methods [Notifier] Remove void return type from test methods [Notifier][Telegram] Remove void return type from test methods [Notifier][Esendex] Remove void return type from test methods [Notifier][Sendinblue] Remove void return type from test methods [Notifier][GoogleChat] Remove void return type from test methods [Notifier] Move ext-json below php requirement to stay consistent
2 parents d97ab72 + fad9e25 commit 28c6718

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1833,7 +1833,7 @@ private function addRateLimiterSection(ArrayNodeDefinition $rootNode)
18331833
->ifTrue(function ($v) { return \is_array($v) && !isset($v['limiters']) && !isset($v['limiter']); })
18341834
->then(function (array $v) {
18351835
$newV = [
1836-
'enabled' => $v['enabled'],
1836+
'enabled' => $v['enabled'] ?? true,
18371837
];
18381838
unset($v['enabled']);
18391839

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,7 +1590,7 @@ public function provideMailer(): array
15901590
/**
15911591
* @dataProvider provideMailer
15921592
*/
1593-
public function testMailer(string $configFile, array $expectedTransports): void
1593+
public function testMailer(string $configFile, array $expectedTransports)
15941594
{
15951595
$container = $this->createContainerFromFile($configFile);
15961596

@@ -1611,14 +1611,14 @@ public function testMailer(string $configFile, array $expectedTransports): void
16111611
$this->assertCount(3, $h->getMethodCalls());
16121612
}
16131613

1614-
public function testMailerWithDisabledMessageBus(): void
1614+
public function testMailerWithDisabledMessageBus()
16151615
{
16161616
$container = $this->createContainerFromFile('mailer_with_disabled_message_bus');
16171617

16181618
$this->assertNull($container->getDefinition('mailer.mailer')->getArgument(1));
16191619
}
16201620

1621-
public function testMailerWithSpecificMessageBus(): void
1621+
public function testMailerWithSpecificMessageBus()
16221622
{
16231623
$container = $this->createContainerFromFile('mailer_with_specific_message_bus');
16241624

0 commit comments

Comments
 (0)