Skip to content

Commit c788596

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: update missing translations arabic [Yaml] simplify the test fix test by letting mock throw the actual expected exception
2 parents 55f2c00 + ec3c2ac commit c788596

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

Tests/ParserTest.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2457,19 +2457,13 @@ public function testParsingMultipleDocuments()
24572457
c: d
24582458
YAML;
24592459

2460-
$expected = ['a' => ['b' => "row\nrow2\n"], 'c' => 'd'];
2461-
2462-
// The parser was not used before, so there is a new line after row2
2463-
$this->assertSame($expected, $this->parser->parse($longDocument));
2464-
2465-
$parser = new Parser();
24662460
// The first parsing set and fixed the totalNumberOfLines in the Parser before, so parsing the short document here
24672461
// to reproduce the issue. If the issue would not have been fixed, the next assertion will fail
2468-
$parser->parse($shortDocument);
2462+
$this->parser->parse($shortDocument);
24692463

2470-
// After the total number of lines has been rset the result will be the same as if a new parser was used
2464+
// After the total number of lines has been reset the result will be the same as if a new parser was used
24712465
// (before, there was no \n after row2)
2472-
$this->assertSame($expected, $parser->parse($longDocument));
2466+
$this->assertSame(['a' => ['b' => "row\nrow2\n"], 'c' => 'd'], $this->parser->parse($longDocument));
24732467
}
24742468
}
24752469

0 commit comments

Comments
 (0)