Merge branch '3.0' into 3.1

fabpot · fabpot · commit b75534a05691 · 2016-06-06T17:08:54.000+02:00
* 3.0:
  [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
@@ -154,7 +154,7 @@ public function getUndefinedControllers()
     {
         return array(
             array('foo', '\LogicException', '/Unable to parse the controller name "foo"\./'),
-            array('foo::bar', '\InvalidArgumentException', '/Class "foo" does not exist\./'),
+            array('oof::bar', '\InvalidArgumentException', '/Class "oof" does not exist\./'),
             array('stdClass', '\LogicException', '/Unable to parse the controller name "stdClass"\./'),
             array(
                 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar',

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public function getUndefinedControllers()`
`154`	`154`	`{`
`155`	`155`	`return array(`
`156`	`156`	`array('foo', '\LogicException', '/Unable to parse the controller name "foo"\./'),`
`157`		`- array('foo::bar', '\InvalidArgumentException', '/Class "foo" does not exist\./'),`
	`157`	`+ array('oof::bar', '\InvalidArgumentException', '/Class "oof" does not exist\./'),`
`158`	`158`	`array('stdClass', '\LogicException', '/Unable to parse the controller name "stdClass"\./'),`
`159`	`159`	`array(`
`160`	`160`	`'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar',`