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
symfony · Jan 30, 2024 · 4b24dca · 4b24dca
2 parents 2ae9f62 + ee94d9b
commit 4b24dca
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/RawMessage.php b/RawMessage.php
@@ -18,6 +18,9 @@
  */
 class RawMessage
 {
+    /**
+     * @var iterable|string
+     */
     private $message;
 
     public function __construct(iterable|string $message)

diff --git a/Tests/EmailTest.php b/Tests/EmailTest.php
@@ -564,8 +564,7 @@ public function testSymfonySerialize()
             }
         ]
     },
-    "body": null,
-    "message": null
+    "body": null
 }
 EOF;
 

diff --git 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
@@ -28,14 +28,14 @@
         "symfony/dependency-injection": "^5.4|^6.0",
         "symfony/property-access": "^5.4|^6.0",
         "symfony/property-info": "^5.4|^6.0",
-        "symfony/serializer": "~6.2.13|^6.3.2"
+        "symfony/serializer": "~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": "<5.4",
-        "symfony/serializer": "<6.2.13|>=6.3,<6.3.2"
+        "symfony/serializer": "<6.3.12|>=6.4,<6.4.3"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Mime\\": "" },