Merge branch '2.7' into 2.8

fabpot · fabpot · commit 84be6486d03e · 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
@@ -150,7 +150,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
`@@ -150,7 +150,7 @@ public function getUndefinedControllers()`
`150`	`150`	`{`
`151`	`151`	`return array(`
`152`	`152`	`array('foo', '\LogicException', 'Unable to parse the controller name "foo".'),`
`153`		`- array('foo::bar', '\InvalidArgumentException', 'Class "foo" does not exist.'),`
	`153`	`+ array('oof::bar', '\InvalidArgumentException', 'Class "oof" does not exist.'),`
`154`	`154`	`array('stdClass', '\LogicException', 'Unable to parse the controller name "stdClass".'),`
`155`	`155`	`array(`
`156`	`156`	`'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar',`