Skip to content

Commit ffc360f

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: The exception should be thrown if an object doesn't implement Traversable AND doesn't implement Countable, not when it doesn't implement Traversable but DOES implement Countable [Form] fix violation mapper tests [HttpKernel] Prevent a fatal error when DebugHandlersListener is used with a kernel with no terminateWithException() method don't rely on deprecated YAML parser feature
2 parents d49fb9f + c9fe42f commit ffc360f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/Dumper/YamlDumperTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ public function testDump()
2828
{
2929
$dumper = new YamlDumper($container = new ContainerBuilder());
3030

31-
$this->assertEqualYamlStructure(self::$fixturesPath.'/yaml/services1.yml', $dumper->dump(), '->dump() dumps an empty container as an empty YAML file');
31+
$this->assertEqualYamlStructure(file_get_contents(self::$fixturesPath.'/yaml/services1.yml'), $dumper->dump(), '->dump() dumps an empty container as an empty YAML file');
3232
}
3333

3434
public function testAddParameters()
3535
{
3636
$container = include self::$fixturesPath.'/containers/container8.php';
3737
$dumper = new YamlDumper($container);
38-
$this->assertEqualYamlStructure(self::$fixturesPath.'/yaml/services8.yml', $dumper->dump(), '->dump() dumps parameters');
38+
$this->assertEqualYamlStructure(file_get_contents(self::$fixturesPath.'/yaml/services8.yml'), $dumper->dump(), '->dump() dumps parameters');
3939
}
4040

4141
/**

0 commit comments

Comments
 (0)