This repository has been archived by the owner on Jan 29, 2020. It is now read-only.
Removes concept of "default handler" #546
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
weierophinney
added a commit
to weierophinney/zend-expressive
that referenced
this pull request
Feb 6, 2018
Removes the zendframework#543 entry indicating the changed `NotFoundDelegate`, instead adding a "Removed" entry for that class. Updates the "Changed" entry for the `NotFoundMiddleware` to indicate its new constructor arguments.
|
|
||
| class NotFoundMiddleware implements MiddlewareInterface | ||
| { | ||
| const TEMPLATE_DEFAULT = 'error::404'; | ||
| const LAYOUT_DEFAULT = 'layout::default'; |
There was a problem hiding this comment.
Can we set visibility for the constants please?
test/ConfigProviderTest.php
Outdated
| @@ -38,7 +37,7 @@ public function testProviderDefinesExpectedAliases() | |||
| { | |||
| $config = $this->provider->getDependencies(); | |||
| $aliases = $config['aliases']; | |||
| $this->assertArrayHasKey(Handler\DefaultHandler::class, $aliases); | |||
| $this->assertArrayHasKey('Zend\Expressive\Delegate\DefaultDelegate', $aliases); | |||
There was a problem hiding this comment.
In ConfigProvider we are using ::class notation. I will do the same here.
| $container->get(NotFoundHandler::class)->willReturn($handler); | ||
| $factory = new NotFoundMiddlewareFactory(); | ||
| $this->container = $this->prophesize(ContainerInterface::class); | ||
| $this->response = $this->prophesize(ResponseInterface::class)->reveal(); |
There was a problem hiding this comment.
I'll move this line before $this->container to have container configuration together.
And I would add private property in the class.
weierophinney
force-pushed
the
feature/merge-not-found-handler-and-middleware
branch
from
d529c32
to
6c14c1e
Compare
weierophinney
added a commit
to weierophinney/zend-expressive
that referenced
this pull request
Feb 6, 2018
Removes the zendframework#543 entry indicating the changed `NotFoundDelegate`, instead adding a "Removed" entry for that class. Updates the "Changed" entry for the `NotFoundMiddleware` to indicate its new constructor arguments.
Because the `MiddlewarePipe` does not compose a "default handler", and because the `MiddlewarePipe` is what the request handler runner dispatches, there is no longer a concept of a "default delegate" (v2) or "default handler" (v3); there is only middleware. As such, this patch merges the `NotFoundHandler` into the `NotFoundMiddleware`. A key is kept for the `DefaultDelegate` service, but it will now resolve to the `NotFoundMiddleware`. Fixes zendframework#441.
Removes the zendframework#543 entry indicating the changed `NotFoundDelegate`, instead adding a "Removed" entry for that class. Updates the "Changed" entry for the `NotFoundMiddleware` to indicate its new constructor arguments.
- Adds property for `$response` - Alters order of operations in `setUp` for consistency
weierophinney
force-pushed
the
feature/merge-not-found-handler-and-middleware
branch
from
6c14c1e
to
ba80db2
Compare
CHANGELOG.md
Outdated
| @@ -97,18 +97,19 @@ All notable changes to this project will be documented in this file, in reverse | |||
|
|
|||
| and removes the dependency http-interop/http-server-middleware. | |||
|
|
|||
| - [#543](https://github.com/zendframework/zend-expressive/pull/543) renames | |||
| - [#543](https://github.com/zendframework/zend-expressive/pull/543) and | |||
| [#546](https://github.com/zendframework/zend-expressive/pull/546) renames the | |||
There was a problem hiding this comment.
This change is in 3.0.0alpha2 changelog but milestone for this PR is set to 3.0.0alpha3.
There was a problem hiding this comment.
Crap, you're right. I'll update.
There was a problem hiding this comment.
Essentially, I'll be merging all the alpha logs to a single 3.0.0 log later, but for now, needs to be slightly different.
weierophinney
deleted the
feature/merge-not-found-handler-and-middleware
branch
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.
Because the
MiddlewarePipedoes not compose a "default handler", and because theMiddlewarePipeis what the request handler runner dispatches, there is no longer a concept of a "default delegate" (v2) or "default handler" (v3); there is only middleware.As such, this patch merges the
NotFoundHandlerinto theNotFoundMiddleware.A key is kept for the
DefaultDelegateservice, but it will now resolve to theNotFoundMiddleware.Fixes #441.