Merge branch '2.7' into 2.8

fabpot · fabpot · commit db83c2b6ad15 · 2016-06-06T17:06:25.000+02:00
* 2.7:
  [BrowserKit] Bump dom-crawler minimum version requirement
  Make one call to "OutputInterface::write" method per table row
  [HttpKernel] Fix context dependent test
  [Debug] Fix context dependent test
diff --git a/Tests/Controller/ControllerResolverTest.php b/Tests/Controller/ControllerResolverTest.php
@@ -127,7 +127,7 @@ public function getUndefinedControllers()
     {
         return array(
             array('foo'),
-            array('foo::bar'),
+            array('oof::bar'),
             array('stdClass'),
             array('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar'),
         );

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function getUndefinedControllers()`
`127`	`127`	`{`
`128`	`128`	`return array(`
`129`	`129`	`array('foo'),`
`130`		`- array('foo::bar'),`
	`130`	`+ array('oof::bar'),`
`131`	`131`	`array('stdClass'),`
`132`	`132`	`array('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar'),`
`133`	`133`	`);`