Skip to content

Commit abdb713

Browse files
Merge branch '5.4' into 6.3
* 5.4: [Mime] Fix serializing uninitialized RawMessage::$message to null [Notifer][Smsapi] Set messageId of SentMessage [DX] Use Symfony "dark-mode"-responsive logo in README support lazy evaluated exception messages with Xdebug 3
2 parents eb32f49 + a63f545 commit abdb713

File tree

10 files changed

+22
-17
lines changed

10 files changed

+22
-17
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center"><a href="https://symfony.com" target="_blank">
2-
<img src="https://symfony.com/logos/symfony_black_02.svg">
2+
<img src="https://symfony.com/logos/symfony_dynamic_01.svg" alt="Symfony Logo">
33
</a></p>
44

55
[Symfony][1] is a **PHP framework** for web and console applications and a set

src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ public function testSymfonySerialize()
9595
}
9696
]
9797
},
98-
"body": null,
99-
"message": null
98+
"body": null
10099
}
101100
EOF;
102101

src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"symfony/security-core": "^5.4|^6.0",
4545
"symfony/security-csrf": "^5.4|^6.0",
4646
"symfony/security-http": "^5.4|^6.0",
47-
"symfony/serializer": "^6.2",
47+
"symfony/serializer": "~6.3.12|^6.4.3",
4848
"symfony/stopwatch": "^5.4|^6.0",
4949
"symfony/console": "^5.4|^6.0",
5050
"symfony/expression-language": "^5.4|^6.0",

src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ public function __construct(string $serviceId, string|\Closure $message = '', in
2323
{
2424
$this->serviceId = $serviceId;
2525

26-
if ($message instanceof \Closure
27-
&& (\function_exists('xdebug_is_enabled') ? xdebug_is_enabled() : \function_exists('xdebug_info'))
28-
) {
26+
if ($message instanceof \Closure && \function_exists('xdebug_is_enabled') && xdebug_is_enabled()) {
2927
$message = $message();
3028
}
3129

src/Symfony/Component/Mime/RawMessage.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
*/
1919
class RawMessage
2020
{
21+
/**
22+
* @var iterable|string
23+
*/
2124
private $message;
2225

2326
public function __construct(iterable|string $message)

src/Symfony/Component/Mime/Tests/EmailTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,7 @@ public function testSymfonySerialize()
564564
}
565565
]
566566
},
567-
"body": null,
568-
"message": null
567+
"body": null
569568
}
570569
EOF;
571570

src/Symfony/Component/Mime/Tests/MessageTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,7 @@ public function testSymfonySerialize()
254254
]
255255
},
256256
"class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\Multipart\\\\MixedPart"
257-
},
258-
"message": null
257+
}
259258
}
260259
EOF;
261260

src/Symfony/Component/Mime/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
"symfony/dependency-injection": "^5.4|^6.0",
2929
"symfony/property-access": "^5.4|^6.0",
3030
"symfony/property-info": "^5.4|^6.0",
31-
"symfony/serializer": "~6.2.13|^6.3.2"
31+
"symfony/serializer": "~6.3.12|^6.4.3"
3232
},
3333
"conflict": {
3434
"egulias/email-validator": "~3.0.0",
3535
"phpdocumentor/reflection-docblock": "<3.2.2",
3636
"phpdocumentor/type-resolver": "<1.4.0",
3737
"symfony/mailer": "<5.4",
38-
"symfony/serializer": "<6.2.13|>=6.3,<6.3.2"
38+
"symfony/serializer": "<6.3.12|>=6.4,<6.4.3"
3939
},
4040
"autoload": {
4141
"psr-4": { "Symfony\\Component\\Mime\\": "" },

src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransport.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ protected function doSend(MessageInterface $message): SentMessage
120120
throw new TransportException(sprintf('Unable to send the SMS: "%s".', $content['message'] ?? 'unknown error'), $response);
121121
}
122122

123-
return new SentMessage($message, (string) $this);
123+
$sentMessage = new SentMessage($message, (string) $this);
124+
$sentMessage->setMessageId($content['list'][0]['id'] ?? '');
125+
126+
return $sentMessage;
124127
}
125128
}

src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Symfony\Component\Mime\Header\UnstructuredHeader;
1818
use Symfony\Component\Mime\Message;
1919
use Symfony\Component\Mime\Part\AbstractPart;
20+
use Symfony\Component\Mime\RawMessage;
2021
use Symfony\Component\Serializer\Exception\LogicException;
2122
use Symfony\Component\Serializer\SerializerAwareInterface;
2223
use Symfony\Component\Serializer\SerializerInterface;
@@ -74,15 +75,18 @@ public function normalize(mixed $object, ?string $format = null, array $context
7475
return $ret;
7576
}
7677

78+
$ret = $this->normalizer->normalize($object, $format, $context);
79+
7780
if ($object instanceof AbstractPart) {
78-
$ret = $this->normalizer->normalize($object, $format, $context);
7981
$ret['class'] = $object::class;
8082
unset($ret['seekable'], $ret['cid'], $ret['handle']);
83+
}
8184

82-
return $ret;
85+
if ($object instanceof RawMessage && \array_key_exists('message', $ret) && null === $ret['message']) {
86+
unset($ret['message']);
8387
}
8488

85-
return $this->normalizer->normalize($object, $format, $context);
89+
return $ret;
8690
}
8791

8892
public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed

0 commit comments

Comments
 (0)