This repository has been archived by the owner on Jan 21, 2020. It is now read-only.
Fix OPTIONS request for not found routes #73
Merged
Conversation
This file contains 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
Pass to next handler when route is not matched.
michalbundyra
commented
Mar 21, 2018
| @@ -73,12 +73,11 @@ public function testReturnsResultOfHandlerWhenRouteSupportsOptionsExplicitly() | |||
| { | |||
| $route = $this->prophesize(Route::class); | |||
|
|
|||
| $result = $this->prophesize(RouteResult::class); | |||
| $result->getMatchedRoute()->will([$route, 'reveal']); | |||
| $result = RouteResult::fromRoute($route->reveal()); | |||
There was a problem hiding this comment.
Changed here to not mocking the RouteResult because if we use more methods we need always extend our mock.
And what's more we can easily mock RouteResult wrong way. We can create new instance only by using fromRoute or fromRouteFailure but we can create invalid mock as we have to mock 4-5 public methods...
| $result = $this->prophesize(RouteResult::class); | ||
| $result->getAllowedMethods()->willReturn($allowedMethods); | ||
| $result->getMatchedRoute()->willReturn(false); | ||
| $result = RouteResult::fromRouteFailure($allowedMethods); |
There was a problem hiding this comment.
The same comment here as above about mocking RouteResult.
|
|
||
| public function testReturnsResultOfHandlerWhenRouteNotFound() | ||
| { | ||
| $result = RouteResult::fromRouteFailure(Route::HTTP_METHOD_ANY); |
There was a problem hiding this comment.
This is the main test, so in case route NOT FOUND we have allowed any methods, but the result is failure.
So isFailure === true and isMethodFailure === false. Then -> 404.
weierophinney
approved these changes
Mar 21, 2018
weierophinney
added a commit
that referenced
this pull request
Mar 21, 2018
weierophinney
added a commit
that referenced
this pull request
Mar 21, 2018
Close #73 Fixes #72 Fixes zendframework/zend-expressive-skeleton#245
weierophinney
added a commit
that referenced
this pull request
Mar 21, 2018
Forward port #73 Conflicts: CHANGELOG.md
|
Thanks, @webimpress! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Pass to next handler when route is not matched.
Fixes #72
masterbranch, and submit against that branch.CHANGELOG.mdentry for the fix.