diff --git a/Tests/MessageTest.php b/Tests/MessageTest.php index f35590c..0eeb497 100644 --- a/Tests/MessageTest.php +++ b/Tests/MessageTest.php @@ -201,7 +201,7 @@ public function testSymfonySerialize() "subtype": "plain", "disposition": null, "name": null, - "encoding": "quoted-printable", + "encoding": "quoted-printable",%A "headers": [], "class": "Symfony\\\\Component\\\\Mime\\\\Part\\\TextPart" }, @@ -211,7 +211,7 @@ public function testSymfonySerialize() "subtype": "html", "disposition": null, "name": null, - "encoding": "quoted-printable", + "encoding": "quoted-printable",%A "headers": [], "class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\TextPart" } @@ -221,13 +221,13 @@ public function testSymfonySerialize() }, { "filename": "text.txt", - "mediaType": "application", + "mediaType": "application",%A "body": "text data", "charset": null, "subtype": "octet-stream", "disposition": "attachment", "name": "text.txt", - "encoding": "base64", + "encoding": "base64",%A "headers": [], "class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\DataPart" } @@ -249,12 +249,12 @@ public function testSymfonySerialize() ], [new JsonEncoder()]); $serialized = $serializer->serialize($e, 'json'); - $this->assertSame($expectedJson, json_encode(json_decode($serialized), \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES)); + $this->assertStringMatchesFormat($expectedJson, json_encode(json_decode($serialized), \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES)); $n = $serializer->deserialize($serialized, Message::class, 'json'); $this->assertEquals($expected->getHeaders(), $n->getHeaders()); $serialized = $serializer->serialize($e, 'json'); - $this->assertSame($expectedJson, json_encode(json_decode($serialized), \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES)); + $this->assertStringMatchesFormat($expectedJson, json_encode(json_decode($serialized), \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES)); } } diff --git a/composer.json b/composer.json index 407bb32..8c6e0c0 100644 --- a/composer.json +++ b/composer.json @@ -26,14 +26,13 @@ "symfony/dependency-injection": "^5.4|^6.0", "symfony/property-access": "^5.4|^6.0", "symfony/property-info": "^5.4|^6.0", - "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6" + "symfony/serializer": "^5.2|^6.0" }, "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": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6" + "symfony/mailer": "<5.4" }, "autoload": { "psr-4": { "Symfony\\Component\\Mime\\": "" },