fix merge

nicolas-grekas · nicolas-grekas · commit 92f77f287c7b · 2017-11-20T22:31:52.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -176,7 +176,7 @@ public function testDumpAsFiles()
         if ('\\' === DIRECTORY_SEPARATOR) {
             $dump = str_replace('\\\\Fixtures\\\\includes\\\\foo.php', '/Fixtures/includes/foo.php', $dump);
         }
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services9_as_files.txt', $dump);
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/php/services9_as_files.txt', $dump);
     }
 
     public function testServicesWithAnonymousFactories()

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public function testDumpAsFiles()`
`176`	`176`	`if ('\\' === DIRECTORY_SEPARATOR) {`
`177`	`177`	`$dump = str_replace('\\\\Fixtures\\\\includes\\\\foo.php', '/Fixtures/includes/foo.php', $dump);`
`178`	`178`	`}`
`179`		`- $this->assertStringEqualsFile(self::$fixturesPath.'/php/services9_as_files.txt', $dump);`
	`179`	`+ $this->assertStringMatchesFormatFile(self::$fixturesPath.'/php/services9_as_files.txt', $dump);`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`public function testServicesWithAnonymousFactories()`