sync message serializer code for forward-compatibility

xabbuh · xabbuh · commit 6888b6024632 · 2022-10-01T19:23:08.000+02:00
diff --git a/src/Symfony/Component/Mime/Tests/MessageTest.php b/src/Symfony/Component/Mime/Tests/MessageTest.php
@@ -202,7 +202,6 @@ public function testSymfonySerialize()
                         "disposition": null,
                         "name": null,
                         "encoding": "quoted-printable",
-                        "seekable": null,
                         "headers": [],
                         "class": "Symfony\\\\Component\\\\Mime\\\\Part\\\TextPart"
                     },
@@ -213,7 +212,6 @@ public function testSymfonySerialize()
                         "disposition": null,
                         "name": null,
                         "encoding": "quoted-printable",
-                        "seekable": null,
                         "headers": [],
                         "class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\TextPart"
                     }
@@ -224,15 +222,12 @@ public function testSymfonySerialize()
             {
                 "filename": "text.txt",
                 "mediaType": "application",
-                "cid": null,
-                "handle": null,
                 "body": "text data",
                 "charset": null,
                 "subtype": "octet-stream",
                 "disposition": "attachment",
                 "name": "text.txt",
                 "encoding": "base64",
-                "seekable": null,
                 "headers": [],
                 "class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\DataPart"
             }
diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json
@@ -28,13 +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.2|^6.0"
+        "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6"
     },
     "conflict": {
         "egulias/email-validator": "~3.0.0",
         "phpdocumentor/reflection-docblock": "<3.2.2",
         "phpdocumentor/type-resolver": "<1.4.0",
-        "symfony/mailer": "<4.4"
+        "symfony/mailer": "<4.4",
+        "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Mime\\": "" },
diff --git a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
@@ -66,6 +66,7 @@ public function normalize($object, string $format = null, array $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;
         }

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public function normalize($object, string $format = null, array $context = [])`
`66`	`66`	`if ($object instanceof AbstractPart) {`
`67`	`67`	`$ret = $this->normalizer->normalize($object, $format, $context);`
`68`	`68`	`$ret['class'] = \get_class($object);`
	`69`	`+ unset($ret['seekable'], $ret['cid'], $ret['handle']);`
`69`	`70`
`70`	`71`	`return $ret;`
`71`	`72`	`}`