Skip to content

Commit 84ab21d

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: (43 commits) [AssetMapper] Fix entrypoint scripts are not preloaded Fix typo in method resolvePackages Make FormPerformanceTestCase compatible with PHPUnit 10 Avoid calling getInvocationCount() [AssetMapper] Always downloading vendor files [Security] Fix resetting traceable listeners [HttpClient] Fix type error with http_version 1.1 [DependencyInjection] Add tests for `AutowireLocator`/`AutowireIterator` [DependencyInjection] Add `#[AutowireIterator]` attribute and improve `#[AutowireLocator]` Update documentation link Fix typo that causes unit test to fail Fix CS [AssetMapper] Add audit command [Mailer] Use idn encoded address otherwise Brevo throws an error [Messenger] Resend failed retries back to failure transport [FrameworkBundle] Fix call to invalid method in NotificationAssertionsTrait [Validator] Add missing italian translations [Notifier] Fix failing testcase Fix order array sum normalizedData and nestedData Add test for 0 and '0' in PeriodicalTrigger Fix '0' case error and remove duplicate code ...
2 parents a238f02 + 8d784b7 commit 84ab21d

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

Channel/EmailChannel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function notify(Notification $notification, RecipientInterface $recipient
6161
if ($email instanceof Email) {
6262
if (!$email->getFrom()) {
6363
if (null === $this->from) {
64-
throw new LogicException(sprintf('To send the "%s" notification by email, you should either configure a global "from" header, set a sender in the global "envelope" of the mailer configuration or set a "from" header in the "asEmailMessage()" method.', get_debug_type($notification)));
64+
throw new LogicException(sprintf('To send the "%s" notification by email, you must configure a "from" header by either setting a sender in the global "envelope" of the mailer configuration or by setting a "from" header in the "asEmailMessage()" method.', get_debug_type($notification)));
6565
}
6666

6767
$email->from($this->from);

Message/NullMessage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ public function getOptions(): ?MessageOptionsInterface
4040

4141
public function getTransport(): ?string
4242
{
43-
return $this->decoratedMessage->getTransport() ?? 'null';
43+
return $this->decoratedMessage->getTransport() ?? null;
4444
}
4545
}

Test/Constraint/NotificationTransportIsEqual.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
*/
2020
final class NotificationTransportIsEqual extends Constraint
2121
{
22-
private string $expectedText;
22+
private ?string $expectedText;
2323

24-
public function __construct(string $expectedText)
24+
public function __construct(?string $expectedText)
2525
{
2626
$this->expectedText = $expectedText;
2727
}

Tests/Message/NullMessageTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ public function testCanBeConstructed(MessageInterface $message)
3030
$this->assertSame($message->getSubject(), $nullMessage->getSubject());
3131
$this->assertSame($message->getRecipientId(), $nullMessage->getRecipientId());
3232
$this->assertSame($message->getOptions(), $nullMessage->getOptions());
33-
34-
(null === $message->getTransport())
35-
? $this->assertSame('null', $nullMessage->getTransport())
36-
: $this->assertSame($message->getTransport(), $nullMessage->getTransport());
33+
$this->assertSame($message->getTransport(), $nullMessage->getTransport());
3734
}
3835

3936
public static function messageDataProvider(): \Generator

0 commit comments

Comments
 (0)