This repository has been archived by the owner on Jan 21, 2020. It is now read-only.
Refactor routing and dispatch logic #48
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
This patch accomplishes several things. First, it extracts the logic for producing a 405 response to new middleware, `Zend\Expressive\Router\MethodNotAllowedMiddleware`. This middleware checks for a route result that is due to method failure, and, in such a case, uses the composed response prototype. Second, the `RouteMiddleware` was modified as follows: - it no longer requires a response prototype - it _always_ injects the route result as a request attribute - it no longer produces a 405 response on its own Third, the `Route` class was modified to implement the PSR-15 `MiddlewareInterface`. When processed, it proxies to the composed middleware instance. Fourth, the `RouteResult` was modified to implement the PSR-15 `MiddlewareInterface`. When processed, if it is a route failure, it delegates to the provided handler. If it is a successful route match, it proxies to the matched `Route` instance. The `getMatchedMiddleware()` method was removed, as it's essentially unnecessary. Fifth, the `DispatchMiddleware` was modified to process the `RouteResult` instance pulled from the request, instead of retrieving its composed middleware.
michalbundyra
approved these changes
Feb 12, 2018
src/MethodNotAllowedMiddleware.php
Outdated
|
|
||
| public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface | ||
| { | ||
| $routeResult = $request->getAttribute(RouteResult::class, false); |
There was a problem hiding this comment.
The second param false can be removed, we are not using that is false, the same result we get with null (default value).
Since the default is to return a `null`, which evaluates as false-y for purposes of conditionals, we can omit it.
michalbundyra
approved these changes
Feb 12, 2018
geerteltink
approved these changes
Feb 13, 2018
test/DispatchMiddlewareTest.php
Outdated
| use Prophecy\Prophecy\ObjectProphecy; | ||
| use Psr\Http\Message\ResponseInterface; | ||
| use Psr\Http\Message\ServerRequestInterface; | ||
| use Psr\Http\Server\MiddlewareInterface; | ||
| use Psr\Http\Server\RequestHandlerInterface; | ||
| use Zend\Expressive\Router\DispatchMiddleware; | ||
| use Zend\Expressive\Router\Route; |
There was a problem hiding this comment.
Not used anymore, same goes for the $responsePrototype property.
| use Prophecy\Prophecy\ObjectProphecy; | ||
| use Psr\Http\Message\ResponseInterface; | ||
| use Psr\Http\Message\ServerRequestInterface; | ||
| use Psr\Http\Server\MiddlewareInterface; |
weierophinney
added a commit
that referenced
this pull request
Feb 13, 2018
weierophinney
added a commit
that referenced
this pull request
Feb 13, 2018
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.
This patch accomplishes several things.
First, it extracts the logic for producing a 405 response to new middleware,
Zend\Expressive\Router\MethodNotAllowedMiddleware. This middleware checks for a route result that is due to method failure, and, in such a case, uses the composed response prototype. This change will allow users to substitute their ownMethodNotAllowedMiddleware, allowing for templated solutions, or to omit it entirely, allowing fallback to the 404 handler.Second, the
RouteMiddlewarewas modified as follows:These changes mean the middleware does only what it says (routing).
Third, the
Routeclass was modified to implement the PSR-15MiddlewareInterface. When processed, it proxies to the composed middleware instance.Fourth, the
RouteResultwas modified to implement the PSR-15MiddlewareInterface. When processed, if it is a route failure, it delegates to the provided handler. If it is a successful route match, it proxies to the matchedRouteinstance. ThegetMatchedMiddleware()method was removed, as it's essentially unnecessary; processing the route result accomplishes the same thing.Fifth, the
DispatchMiddlewarewas modified to process theRouteResultinstance pulled from the request, instead of retrieving its composed middleware to process.