bug #53678 [Mime] Fix serializing uninitialized RawMessage::$message to null (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit a63f545f662c · 2024-01-30T09:05:29.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Mime] Fix serializing uninitialized `RawMessage::$message` to null | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #53664 | License | MIT Commits ------- 122f58c [Mime] Fix serializing uninitialized RawMessage::$message to null
diff --git a/src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php b/src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php
@@ -94,8 +94,7 @@ public function testSymfonySerialize()
             }
         ]
     },
-    "body": null,
-    "message": null
+    "body": null
 }
 EOF;
 
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -42,7 +42,7 @@
         "symfony/security-core": "^4.4|^5.0|^6.0",
         "symfony/security-csrf": "^4.4|^5.0|^6.0",
         "symfony/security-http": "^4.4|^5.0|^6.0",
-        "symfony/serializer": "^5.2|^6.0",
+        "symfony/serializer": "^5.4.35|~6.3.12|^6.4.3",
         "symfony/stopwatch": "^4.4|^5.0|^6.0",
         "symfony/console": "^5.3|^6.0",
         "symfony/expression-language": "^4.4|^5.0|^6.0",
diff --git a/src/Symfony/Component/Mime/RawMessage.php b/src/Symfony/Component/Mime/RawMessage.php
@@ -18,6 +18,9 @@
  */
 class RawMessage implements \Serializable
 {
+    /**
+     * @var iterable|string
+     */
     private $message;
 
     /**
diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -547,8 +547,7 @@ public function testSymfonySerialize()
             }
         ]
     },
-    "body": null,
-    "message": null
+    "body": null
 }
 EOF;
 
diff --git a/src/Symfony/Component/Mime/Tests/MessageTest.php b/src/Symfony/Component/Mime/Tests/MessageTest.php
@@ -254,8 +254,7 @@ public function testSymfonySerialize()
             ]
         },
         "class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\Multipart\\\\MixedPart"
-    },
-    "message": null
+    }
 }
 EOF;
 
diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/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\\": "" },
diff --git a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Mime\Header\UnstructuredHeader;
 use Symfony\Component\Mime\Message;
 use Symfony\Component\Mime\Part\AbstractPart;
+use Symfony\Component\Mime\RawMessage;
 use Symfony\Component\Serializer\SerializerAwareInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 
@@ -63,15 +64,18 @@ public function normalize($object, ?string $format = null, array $context = [])
             return $ret;
         }
 
+        $ret = $this->normalizer->normalize($object, $format, $context);
+
         if ($object instanceof AbstractPart) {
-            $ret = $this->normalizer->normalize($object, $format, $context);
             $ret['class'] = \get_class($object);
             unset($ret['seekable'], $ret['cid'], $ret['handle']);
+        }
 
-            return $ret;
+        if ($object instanceof RawMessage && \array_key_exists('message', $ret) && null === $ret['message']) {
+            unset($ret['message']);
         }
 
-        return $this->normalizer->normalize($object, $format, $context);
+        return $ret;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,7 @@ public function testSymfonySerialize()`
`94`	`94`	`}`
`95`	`95`	`]`
`96`	`96`	`},`
`97`		`- "body": null,`
`98`		`- "message": null`
	`97`	`+ "body": null`
`99`	`98`	`}`
`100`	`99`	`EOF;`
`101`	`100`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@`
`18`	`18`	`*/`
`19`	`19`	`class RawMessage implements \Serializable`
`20`	`20`	`{`
	`21`	`+ /**`
	`22`	`+ * @var iterable\|string`
	`23`	`+ */`
`21`	`24`	`private $message;`
`22`	`25`
`23`	`26`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -547,8 +547,7 @@ public function testSymfonySerialize()`
`547`	`547`	`}`
`548`	`548`	`]`
`549`	`549`	`},`
`550`		`- "body": null,`
`551`		`- "message": null`
	`550`	`+ "body": null`
`552`	`551`	`}`
`553`	`552`	`EOF;`
`554`	`553`
Original file line number	Diff line number	Diff line change
`@@ -254,8 +254,7 @@ public function testSymfonySerialize()`
`254`	`254`	`]`
`255`	`255`	`},`
`256`	`256`	`"class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\Multipart\\\\MixedPart"`
`257`		`- },`
`258`		`- "message": null`
	`257`	`+ }`
`259`	`258`	`}`
`260`	`259`	`EOF;`
`261`	`260`