[2.3] Fix tests on Windows

symfony · Jun 10, 2015 · e3e5f3d · e3e5f3d
1 parent a48d36a
commit e3e5f3d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
@@ -73,8 +73,8 @@ public function getExtractData()
     }
 
     /**
-     * @expectedException        \Twig_Error
-     * @expectedExceptionMessage Unclosed "block" in "extractor/syntax_error.twig" at line 1
+     * @expectedException              \Twig_Error
+     * @expectedExceptionMessageRegExp /Unclosed "block" in "extractor(\/|\\)syntax_error\.twig" at line 1/
      */
     public function testExtractSyntaxError()
     {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php
@@ -22,7 +22,7 @@ class RouterDebugCommandTest extends \PHPUnit_Framework_TestCase
     public function testDebugAllRoutes()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('name' => null));
+        $ret = $tester->execute(array('name' => null), array('decorated' => false));
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('[router] Current routes', $tester->getDisplay());
@@ -31,7 +31,7 @@ public function testDebugAllRoutes()
     public function testDebugSingleRoute()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('name' => 'foo'));
+        $ret = $tester->execute(array('name' => 'foo'), array('decorated' => false));
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('[router] Route "foo"', $tester->getDisplay());

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
@@ -24,7 +24,7 @@ class RouterMatchCommandTest extends \PHPUnit_Framework_TestCase
     public function testWithMatchPath()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('path_info' => '/foo', 'foo'));
+        $ret = $tester->execute(array('path_info' => '/foo', 'foo'), array('decorated' => false));
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('[router] Route "foo"', $tester->getDisplay());
@@ -33,7 +33,7 @@ public function testWithMatchPath()
     public function testWithNotMatchPath()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('path_info' => '/test', 'foo'));
+        $ret = $tester->execute(array('path_info' => '/test', 'foo'), array('decorated' => false));
 
         $this->assertEquals(1, $ret, 'Returns 1 in case of failure');
         $this->assertContains('None of the routes match the path "/test"', $tester->getDisplay());