[FrameworkBundle] check _controller attribute is a string before parsing it #23457
Conversation
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
voronkovich
reviewed
Jul 9, 2017
| @@ -51,4 +51,23 @@ public function testSkipsOtherControllerFormats() | |||
| $subscriber->onKernelRequest(new GetResponseEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST)); | |||
| $this->assertEquals('Other:format', $request->attributes->get('_controller')); | |||
| } | |||
|
|
|||
| public function testSkipsNonStringControllers() | |||
There was a problem hiding this comment.
@alekitto, you could use the data provider to avoid a code duplication. Like this:
/** @dataProvider provideSkippedControllers */
public function testSkipsOtherControllerFormats($controller)
{
// ...
$this->assertEquals($controller, $request->attributes->get('_controller'));
}
private function provideSkippedControllers()
{
yield [ 'Other:format' ];
yield [ function() {} ];
}c7385cc to
7f0da59
Compare
|
@voronkovich Ok, i've added a data provider for this test as requested. |
nicolas-grekas
approved these changes
Jul 10, 2017
| @@ -37,18 +37,27 @@ public function testReplacesControllerAttribute() | |||
| $this->assertEquals('App\\Final\\Format::methodName', $request->attributes->get('_controller')); | |||
| } | |||
|
|
|||
| public function testSkipsOtherControllerFormats() | |||
| public function provideSkippedControllers() | |||
There was a problem hiding this comment.
can you please move it below the test case?
xabbuh
approved these changes
Jul 10, 2017
|
Thank you @alekitto. |
nicolas-grekas
added a commit
that referenced
this pull request
Jul 11, 2017
…before parsing it (alekitto) This PR was merged into the 3.3 branch. Discussion ---------- [FrameworkBundle] check _controller attribute is a string before parsing it | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23456 | License | MIT Avoids an error to be raised in case described in issue #23456. Commits ------- 0b349ae check _controller attribute is a string before parsing it
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Avoids an error to be raised in case described in issue #23456.