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

Commit 2ca2f21

Browse files
committed
Merge branch 'feature/remove-subcomponents'
Close #204
2 parents 37cc687 + 1cada6a commit 2ca2f21

22 files changed

+17
-1205
lines changed

CHANGELOG.md

+15-10
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Third release candidate.
99
### Added
1010

1111
- [#185](https://github.com/zendframework/zend-expressive/pull/185)
12-
Support casting zend-view models to arrays
12+
Support casting zend-view models to arrays.
1313
- [#192](https://github.com/zendframework/zend-expressive/pull/192) adds support
1414
for specifying arrays of middleware both when routing and when creating
1515
pipeline middleware. This feature is opt-in and backwards compatible; simply
@@ -18,14 +18,14 @@ Third release candidate.
1818
or fully qualified class names that can be instantiated without arguments, and
1919
which result in invokable middleware.
2020
- [#200](https://github.com/zendframework/zend-expressive/pull/200) adds a new
21-
interface, `Zend\Expressive\Router\RouteResultObserverInterface`.
22-
`Zend\Expressive\Application` now also defines two methods,
23-
`attachRouteResultObserver()` and `detachRouteResultObserver()`, which accept
24-
instances of the interface. During `routeMiddleware()`, all observers are
25-
updated immediately following the call to `RouterInterface::match()` with the
26-
`RouteResult` instance. This feature enables the ability to notify objects of
27-
the calculated `RouteResult` without needing to inject middleware into the
28-
system.
21+
interface, `Zend\Expressive\Router\RouteResultObserverInterface` (since moved
22+
to the zend-expressive-router package). `Zend\Expressive\Application` now
23+
also defines two methods, `attachRouteResultObserver()` and
24+
`detachRouteResultObserver()`, which accept instances of the interface. During
25+
`routeMiddleware()`, all observers are updated immediately following the call
26+
to `RouterInterface::match()` with the `RouteResult` instance. This feature
27+
enables the ability to notify objects of the calculated `RouteResult` without
28+
needing to inject middleware into the system.
2929
- [#81](https://github.com/zendframework/zend-expressive/pull/81) adds a
3030
cookbook entry for creating 404 handlers.
3131

@@ -35,7 +35,12 @@ Third release candidate.
3535

3636
### Removed
3737

38-
- Nothing.
38+
- [#204](https://github.com/zendframework/zend-expressive/pull/204) removes the
39+
`Router` and `Template` components, as they are now shipped with the following
40+
packages, respectively:
41+
- [zendframework/zend-expressive-router](https://github.com/zendframework/zend-expressive-router)
42+
- [zendframework/zend-expressive-template](https://github.com/zendframework/zend-expressive-template)
43+
This package has been updated to depend on each of them.
3944

4045
### Fixed
4146

composer.json

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
"container-interop/container-interop": "^1.1",
2121
"psr/http-message": "^1.0",
2222
"zendframework/zend-diactoros": "^1.1",
23+
"zendframework/zend-expressive-router": "^1.0",
24+
"zendframework/zend-expressive-template": "^1.0.1",
2325
"zendframework/zend-stdlib": "^2.7",
2426
"zendframework/zend-stratigility": "^1.1"
2527
},

src/Exception/RenderingException.php

-16
This file was deleted.

src/Router/Exception/ExceptionInterface.php

-14
This file was deleted.

src/Router/Exception/InvalidArgumentException.php

-14
This file was deleted.

src/Router/Exception/RuntimeException.php

-14
This file was deleted.

src/Router/Route.php

-204
This file was deleted.

0 commit comments

Comments
 (0)