From ee94d9b538f93abbbc1ee4ccff374593117b04a9 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 30 Jan 2024 08:55:07 +0100 Subject: [PATCH] [Mime] Fix serializing uninitialized RawMessage::$message to null --- RawMessage.php | 3 +++ Tests/EmailTest.php | 3 +-- Tests/MessageTest.php | 3 +-- composer.json | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/RawMessage.php b/RawMessage.php index d2a311d..ace1960 100644 --- a/RawMessage.php +++ b/RawMessage.php @@ -18,6 +18,9 @@ */ class RawMessage implements \Serializable { + /** + * @var iterable|string + */ private $message; /** diff --git a/Tests/EmailTest.php b/Tests/EmailTest.php index 058849f..a868ae7 100644 --- a/Tests/EmailTest.php +++ b/Tests/EmailTest.php @@ -547,8 +547,7 @@ public function testSymfonySerialize() } ] }, - "body": null, - "message": null + "body": null } EOF; diff --git a/Tests/MessageTest.php b/Tests/MessageTest.php index c2c4c37..308eb8f 100644 --- a/Tests/MessageTest.php +++ b/Tests/MessageTest.php @@ -254,8 +254,7 @@ public function testSymfonySerialize() ] }, "class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\Multipart\\\\MixedPart" - }, - "message": null + } } EOF; diff --git a/composer.json b/composer.json index 195f041..11823ef 100644 --- a/composer.json +++ b/composer.json @@ -28,14 +28,14 @@ "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/property-access": "^4.4|^5.1|^6.0", "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.4.26|~6.2.13|^6.3.2" + "symfony/serializer": "^5.4.35|~6.3.12|^6.4.3" }, "conflict": { "egulias/email-validator": "~3.0.0", "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<4.4", - "symfony/serializer": "<5.4.26|>=6,<6.2.13|>=6.3,<6.3.2" + "symfony/serializer": "<5.4.35|>=6,<6.3.12|>=6.4,<6.4.3" }, "autoload": { "psr-4": { "Symfony\\Component\\Mime\\": "" },