Skip to content

Commit a5a1bca

Browse files
Merge branch '6.2' into 6.3
* 6.2: [VarDumper] Fix calling scope detection inside magic accessors [Validator] add missing German translations [Serializer] Fix denormalizing abstract part headers in MimeMessageNormalizer [Form] Remove an obsolete phpdoc comment [FrameworkBundle][Workflow] Throw exception is workflow.xxx.transitions is not an array
2 parents 7b5d212 + 44a1f62 commit a5a1bca

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

Tests/MessageTest.php

+13-2
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ public function testSymfonySerialize()
168168
),
169169
new DataPart('text data', 'text.txt')
170170
);
171+
$body->getHeaders()->addHeader('foo', 'bar');
171172
$e = new Message((new Headers())->addMailboxListHeader('To', ['[email protected]']), $body);
172173
$expected = clone $e;
173174

@@ -232,7 +233,17 @@ public function testSymfonySerialize()
232233
"class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\DataPart"
233234
}
234235
],
235-
"headers": [],
236+
"headers": {
237+
"foo": [
238+
{
239+
"value": "bar",
240+
"name": "foo",
241+
"lineLength": 76,
242+
"lang": null,
243+
"charset": "utf-8"
244+
}
245+
]
246+
},
236247
"class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\Multipart\\\\MixedPart"
237248
},
238249
"message": null
@@ -252,7 +263,7 @@ public function testSymfonySerialize()
252263
$this->assertStringMatchesFormat($expectedJson, json_encode(json_decode($serialized), \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES));
253264

254265
$n = $serializer->deserialize($serialized, Message::class, 'json');
255-
$this->assertEquals($expected->getHeaders(), $n->getHeaders());
266+
$this->assertEquals($expected, $n);
256267

257268
$serialized = $serializer->serialize($e, 'json');
258269
$this->assertStringMatchesFormat($expectedJson, json_encode(json_decode($serialized), \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES));

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
"symfony/dependency-injection": "^5.4|^6.0",
2828
"symfony/property-access": "^5.4|^6.0",
2929
"symfony/property-info": "^5.4|^6.0",
30-
"symfony/serializer": "^6.2"
30+
"symfony/serializer": "^6.2.13"
3131
},
3232
"conflict": {
3333
"egulias/email-validator": "~3.0.0",
3434
"phpdocumentor/reflection-docblock": "<3.2.2",
3535
"phpdocumentor/type-resolver": "<1.4.0",
3636
"symfony/mailer": "<5.4",
37-
"symfony/serializer": "<6.2"
37+
"symfony/serializer": "<6.2.13"
3838
},
3939
"autoload": {
4040
"psr-4": { "Symfony\\Component\\Mime\\": "" },

0 commit comments

Comments
 (0)