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

Commit d734c64

Browse files
committed
Merge branch 'feature/required-dependencies' into develop
Close #115
2 parents 5a640e5 + 5eb38de commit d734c64

File tree

4 files changed

+618
-602
lines changed

4 files changed

+618
-602
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ for full details on how to migrate your v2 application.
4848
and [zend-mvc-i18n](https://zendframework.github.io/zend-mvc-i18n/) packages;
4949
installing `zendframework/zend-mvc-i18n` will restore i18n functionality in
5050
your application.
51+
- [#115](https://github.com/zendframework/zend-mvc/pull/115) removes the
52+
requirement for zend-filter in the `InjectTemplateListener` by inlining the
53+
logic from `Zend\Filter\Word\CamelCaseToDash`.
5154

5255
### Fixed
5356

@@ -56,6 +59,17 @@ for full details on how to migrate your v2 application.
5659
requests optional. `json_decode()` is now used by default, falling back to
5760
`Zend\Json\Json::decode()` if it is available. If neither are available, an
5861
exception is now thrown.
62+
- [#115](https://github.com/zendframework/zend-mvc/pull/115) updates the
63+
dependency list, per https://github.com/zendframework/maintainers/wiki/zend-mvc-v3-refactor:-reduce-components#required-components,
64+
to do the following:
65+
- Makes the following components required:
66+
- zend-modulemanager
67+
- zend-view
68+
- Makes the following components optional:
69+
- zend-form
70+
- zend-hydrator
71+
- zend-json
72+
- zend-psr7bridge
5973

6074
## 2.7.5 - TBD
6175

composer.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,25 @@
1515
"require": {
1616
"php": "^5.5 || ^7.0",
1717
"zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
18-
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
1918
"zendframework/zend-http": "^2.5.4",
20-
"zendframework/zend-hydrator": "^1.1 || ^2.1",
21-
"zendframework/zend-form": "^2.7",
19+
"zendframework/zend-modulemanager": "^2.7.1",
2220
"zendframework/zend-router": "^3.0",
21+
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
2322
"zendframework/zend-stdlib": "^2.7.5 || ^3.0",
24-
"zendframework/zend-psr7bridge": "^0.2",
23+
"zendframework/zend-view": "^2.6.3",
2524
"container-interop/container-interop": "^1.1"
2625
},
2726
"require-dev": {
2827
"zendframework/zend-di": "^2.6",
2928
"zendframework/zend-filter": "^2.6.1",
29+
"zendframework/zend-form": "^2.7",
30+
"zendframework/zend-hydrator": "^1.1 || ^2.1",
3031
"zendframework/zend-inputfilter": "^2.6",
32+
"zendframework/zend-json": "^2.6.1 || ^3.0",
3133
"zendframework/zend-log": "^2.7.1",
32-
"zendframework/zend-modulemanager": "^2.7.1",
34+
"zendframework/zend-psr7bridge": "^0.2",
3335
"zendframework/zend-serializer": "^2.6.1",
3436
"zendframework/zend-validator": "^2.6",
35-
"zendframework/zend-view": "^2.6.3",
3637
"fabpot/php-cs-fixer": "1.7.*",
3738
"phpunit/phpunit": "^4.5"
3839
},
@@ -42,7 +43,7 @@
4243
"zendframework/zend-filter": "Zend\\Filter component",
4344
"zendframework/zend-http": "Zend\\Http component",
4445
"zendframework/zend-inputfilter": "Zend\\Inputfilter component",
45-
"zendframework/zend-json": "To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",
46+
"zendframework/zend-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",
4647
"zendframework/zend-log": "Zend\\Log component",
4748
"zendframework/zend-modulemanager": "Zend\\ModuleManager component",
4849
"zendframework/zend-mvc-console": "zend-mvc-console provides the ability to expose zend-mvc as a console application",
@@ -51,6 +52,7 @@
5152
"zendframework/zend-mvc-plugin-flashmessenger": "To provide flash messaging capabilities between requests",
5253
"zendframework/zend-mvc-plugin-identity": "To access the authenticated identity (per zend-authentication) in controllers",
5354
"zendframework/zend-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers",
55+
"zendframework/zend-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow",
5456
"zendframework/zend-serializer": "Zend\\Serializer component",
5557
"zendframework/zend-validator": "Zend\\Validator component",
5658
"zendframework/zend-view": "Zend\\View component"

0 commit comments

Comments
 (0)