Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Ensure that MiddlewarePipes are called as callables if an error is present #95

Merged
merged 3 commits into from
Jan 5, 2017
Merged

Ensure that MiddlewarePipes are called as callables if an error is present #95

merged 3 commits into from
Jan 5, 2017

Commits on Jan 5, 2017

  1. Ensure that MiddlewarePipes are called as callables if an error is pr… 

    …esent

As reported in zendframework/zend-expressive#416, error middleware
nested inside a `MiddlewarePipe` was not being dispatched. This was due
to the fact that `Dispatch` was identifying the pipeline as http-interop
middleware, and thus dropping the `$err` argument (as interop middleware
cannot accept that argument).

Theis patch updates `Dispatch` to check if the middleware is a
`MiddlewarePipe` and a non-null `$err` is present; if so, it now
dispatches it as callable middleware instead of as interop middleware.
    @weierophinney
    weierophinney committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    1b9fb10 View commit details
    Browse the repository at this point in the history

  2. Removed unnecessary todo annotations 

    - Class and test class go away in 2.0.0 entirely
    @weierophinney
    weierophinney committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    0a88ee2 View commit details
    Browse the repository at this point in the history

  3. Test error middleware handling against throwables as well as exceptions 

    - per @Ocramius
    @weierophinney
    weierophinney committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    eefbe51 View commit details
    Browse the repository at this point in the history