-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
[FrameworkBundle] Simplify "invokable" controllers as services #11193
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
155 changes: 155 additions & 0 deletions
155
src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| <?php | ||
|
|
||
| namespace Symfony\Bundle\FrameworkBundle\Tests\Controller; | ||
|
|
||
| use Psr\Log\LoggerInterface; | ||
| use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser; | ||
| use Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver; | ||
| use Symfony\Component\DependencyInjection\ContainerAwareInterface; | ||
| use Symfony\Component\DependencyInjection\ContainerInterface; | ||
| use Symfony\Component\HttpFoundation\Request; | ||
| use Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest as BaseControllerResolverTest; | ||
|
|
||
| class ControllerResolverTest extends BaseControllerResolverTest | ||
| { | ||
| public function testGetControllerOnContainerAware() | ||
| { | ||
| $resolver = $this->createControllerResolver(); | ||
| $request = Request::create('/'); | ||
| $request->attributes->set('_controller', 'Symfony\Bundle\FrameworkBundle\Tests\Controller\ContainerAwareController::testAction'); | ||
|
|
||
| $controller = $resolver->getController($request); | ||
|
|
||
| $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerInterface', $controller[0]->getContainer()); | ||
| $this->assertSame('testAction', $controller[1]); | ||
| } | ||
|
|
||
| public function testGetControllerWithBundleNotation() | ||
| { | ||
| $shortName = 'FooBundle:Default:test'; | ||
| $parser = $this->createMockParser(); | ||
| $parser->expects($this->once()) | ||
| ->method('parse') | ||
| ->with($shortName) | ||
| ->will($this->returnValue('Symfony\Bundle\FrameworkBundle\Tests\Controller\ContainerAwareController::testAction')) | ||
| ; | ||
|
|
||
| $resolver = $this->createControllerResolver(null, $parser); | ||
| $request = Request::create('/'); | ||
| $request->attributes->set('_controller', $shortName); | ||
|
|
||
| $controller = $resolver->getController($request); | ||
|
|
||
| $this->assertInstanceOf('Symfony\Bundle\FrameworkBundle\Tests\Controller\ContainerAwareController', $controller[0]); | ||
| $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerInterface', $controller[0]->getContainer()); | ||
| $this->assertSame('testAction', $controller[1]); | ||
| } | ||
|
|
||
| public function testGetControllerService() | ||
| { | ||
| $container = $this->createMockContainer(); | ||
| $container->expects($this->once()) | ||
| ->method('get') | ||
| ->with('foo') | ||
| ->will($this->returnValue($this)) | ||
| ; | ||
|
|
||
| $resolver = $this->createControllerResolver(null, null, $container); | ||
| $request = Request::create('/'); | ||
| $request->attributes->set('_controller', 'foo:controllerMethod1'); | ||
|
|
||
| $controller = $resolver->getController($request); | ||
|
|
||
| $this->assertInstanceOf(get_class($this), $controller[0]); | ||
| $this->assertSame('controllerMethod1', $controller[1]); | ||
| } | ||
|
|
||
| public function testGetControllerInvokableService() | ||
| { | ||
| $container = $this->createMockContainer(); | ||
| $container->expects($this->once()) | ||
| ->method('has') | ||
| ->with('foo') | ||
| ->will($this->returnValue(true)) | ||
| ; | ||
| $container->expects($this->once()) | ||
| ->method('get') | ||
| ->with('foo') | ||
| ->will($this->returnValue($this)) | ||
| ; | ||
|
|
||
| $resolver = $this->createControllerResolver(null, null, $container); | ||
| $request = Request::create('/'); | ||
| $request->attributes->set('_controller', 'foo'); | ||
|
|
||
| $controller = $resolver->getController($request); | ||
|
|
||
| $this->assertInstanceOf(get_class($this), $controller); | ||
| } | ||
|
|
||
| /** | ||
| * @dataProvider getUndefinedControllers | ||
| */ | ||
| public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null) | ||
| { | ||
| $this->setExpectedException($exceptionName, $exceptionMessage); | ||
|
|
||
| parent::testGetControllerOnNonUndefinedFunction($controller); | ||
| } | ||
|
|
||
| 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('stdClass', '\LogicException', 'Unable to parse the controller name "stdClass".'), | ||
| array( | ||
| 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar', | ||
| '\InvalidArgumentException', | ||
| 'Controller "Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar" for URI "/" is not callable.' | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| protected function createControllerResolver(LoggerInterface $logger = null, ControllerNameParser $parser = null, ContainerInterface $container = null) | ||
| { | ||
| if (!$parser) { | ||
| $parser = $this->createMockParser(); | ||
| } | ||
|
|
||
| 8000 | if (!$container) { | |
| $container = $this->createMockContainer(); | ||
| } | ||
|
|
||
| return new ControllerResolver($container, $parser, $logger); | ||
| } | ||
|
|
||
| protected function createMockParser() | ||
| { | ||
| return $this->getMock('Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser', array(), array(), '', false); | ||
| } | ||
|
|
||
| protected function createMockContainer() | ||
| { | ||
| return $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); | ||
| } | ||
| } | ||
|
|
||
| class ContainerAwareController implements ContainerAwareInterface | ||
| { | ||
| private $container; | ||
|
|
||
| public function setContainer(ContainerInterface $container = null) | ||
| { | ||
| $this->container = $container; | ||
| } | ||
|
|
||
| public function getContainer() | ||
| { | ||
| return $this->container; | ||
| } | ||
|
|
||
| public function testAction() | ||
| { | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably previous condition also must check whether container has such service.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nope. The previous condition is explicitly a service syntax. Not checking if the container has a service means you get an exception telling you the service does not exist in case you made a typo.