Skip to content

Commit 1396fdf

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: [Process] Fix stopping a process on Windows [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name Added a note about the new requirement iconv. Improved error messages for Yaml Deprecations Added a test case for the Logger class. [Form] Fix choices defined as Traversable CS: general fixes Suggested Process dependency
2 parents e8e7f1b + 0637cb7 commit 1396fdf

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Tests/Encoder/XmlEncoderTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function testAttributes()
7474
'@Type' => 'test',
7575
),
7676
'föo_bär' => 'a',
77-
'Bar' => array(1,2,3),
77+
'Bar' => array(1, 2, 3),
7878
'a' => 'b',
7979
);
8080
$expected = '<?xml version="1.0"?>'."\n".
@@ -384,7 +384,7 @@ public function testDecodeWithoutItemHash()
384384
'@Type' => 'test',
385385
),
386386
'föo_bär' => 'a',
387-
'Bar' => array(1,2,3),
387+
'Bar' => array(1, 2, 3),
388388
'a' => 'b',
389389
);
390390
$expected = array(
@@ -397,7 +397,7 @@ public function testDecodeWithoutItemHash()
397397
'@Type' => 'test',
398398
),
399399
'föo_bär' => 'a',
400-
'Bar' => array(1,2,3),
400+
'Bar' => array(1, 2, 3),
401401
'a' => 'b',
402402
);
403403
$xml = $this->encoder->encode($obj, 'xml');

0 commit comments

Comments
 (0)