Skip to content

Commit 3a9af43

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: fixed CS tweaked default CS fixer config [HttpKernel] Dont close the output stream in debug move HttpKernel component to require section Fixed oci and sqlsrv merge queries when emulation is disabled - fixes #17284 [Session] fix PDO transaction aborted under PostgreSQL [Console] Use InputInterface inherited doc as possible add docblock type elements to support newly added IteratorAggregate::getIterator PhpStorm support FormBuilderInterface: fix getForm() return type. Fixed typo in PHPDoc
2 parents 3c370a3 + 60c6b45 commit 3a9af43

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/Encoder/XmlEncoderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,8 @@ public function testEncodeSerializerXmlRootNodeNameOption()
249249
$this->assertEquals($expected, $serializer->serialize($array, 'xml', $options));
250250
}
251251

252-
public function testEncodeTraversableWhenNormalizable() {
252+
public function testEncodeTraversableWhenNormalizable()
253+
{
253254
$this->encoder = new XmlEncoder();
254255
$serializer = new Serializer(array(new CustomNormalizer()), array('xml' => new XmlEncoder()));
255256
$this->encoder->setSerializer($serializer);
@@ -261,7 +262,6 @@ public function testEncodeTraversableWhenNormalizable() {
261262
XML;
262263

263264
$this->assertEquals($expected, $serializer->serialize(new NormalizableTraversableDummy(), 'xml'));
264-
265265
}
266266

267267
public function testDecode()

0 commit comments

Comments
 (0)