minor #18979 [HttpKernel] Fix context dependent test (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 2e938491d6c2 · 2016-06-06T14:26:28.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [HttpKernel] Fix context dependent test | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Class `Foo` exists when the ClassLoader component is tested alongside with HttpKernel Commits ------- 065dee8 [HttpKernel] Fix context dependent test
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Bundle/FrameworkBundle/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',
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Component/HttpKernel/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
`@@ -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',`
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`	`);`