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

Commit b6a0541

Browse files
committed
Merge branch 'feature/remove-zend-filter' into develop
Close #117
2 parents b3c2e7d + 692f8ee commit b6a0541

File tree

7 files changed

+23
-28
lines changed

7 files changed

+23
-28
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ for full details on how to migrate your v2 application.
5555
functionality related to integrating zend-servicemanager and zend-di. If you
5656
used this functionality previously, it is now available via a separate
5757
package, [zend-servicemanager-di](https://zendframework.github.io/zend-servicemanager-di/]).
58+
- [#117](https://github.com/zendframework/zend-mvc/pull/117) removes the
59+
functionality related to exposing and configuring the zend-filter
60+
`FilterPluginManager`. That functionality is now exposed directly by the
61+
zend-filter component.
5862

5963
### Fixed
6064

composer.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
"container-interop/container-interop": "^1.1"
2525
},
2626
"require-dev": {
27-
"zendframework/zend-filter": "^2.6.1",
2827
"zendframework/zend-form": "^2.7",
2928
"zendframework/zend-hydrator": "^1.1 || ^2.1",
3029
"zendframework/zend-inputfilter": "^2.6",
@@ -39,7 +38,6 @@
3938
"suggest": {
4039
"zendframework/zend-config": "Zend\\Config component",
4140
"zendframework/zend-di": "Zend\\Di component",
42-
"zendframework/zend-filter": "Zend\\Filter component",
4341
"zendframework/zend-http": "Zend\\Http component",
4442
"zendframework/zend-inputfilter": "Zend\\Inputfilter component",
4543
"zendframework/zend-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",

composer.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/book/migration/to-v3-0.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,23 @@ ensure console tooling continues to work.
100100
> [zf-console](https://github.com/zfcampus/zf-console) or
101101
> [Aura.Cli](https://github.com/auraphp/Aura.Cli).
102102
103+
## Filter integration
104+
105+
In version 2, zend-mvc exposed a `FilterManager` service by default, and
106+
provided specifications to zend-modulemanager's `ServiceListener`
107+
to allow modules to provide filter configuration.
108+
109+
This functionality is now removed from zend-mvc. It is now exposed directly by
110+
the [zend-filter](https://zendframework.github.io/zend-filter/) component
111+
itself. To add it, install zend-filter:
112+
113+
```bash
114+
$ composer require zendframework/zend-filter
115+
```
116+
117+
Note: the above assumes you have already installed zend-component-installer, per
118+
the section above on [dependency reduction](#dependency-reduction).
119+
103120
## i18n integration
104121

105122
Internationalization tooling, including:

src/Service/FilterManagerFactory.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/Service/ModuleManagerFactory.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,6 @@ public function __invoke(ContainerInterface $container, $name, array $options =
7373
'Zend\ModuleManager\Feature\ValidatorProviderInterface',
7474
'getValidatorConfig'
7575
);
76-
$serviceListener->addServiceManager(
77-
'FilterManager',
78-
'filters',
79-
'Zend\ModuleManager\Feature\FilterProviderInterface',
80-
'getFilterConfig'
81-
);
8276
$serviceListener->addServiceManager(
8377
'FormElementManager',
8478
'form_elements',

src/Service/ServiceListenerFactory.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ class ServiceListenerFactory implements FactoryInterface
7070
'ControllerManager' => 'Zend\Mvc\Service\ControllerManagerFactory',
7171
'ControllerPluginManager' => 'Zend\Mvc\Service\ControllerPluginManagerFactory',
7272
'DispatchListener' => 'Zend\Mvc\Service\DispatchListenerFactory',
73-
'FilterManager' => 'Zend\Mvc\Service\FilterManagerFactory',
7473
'FormAnnotationBuilder' => 'Zend\Mvc\Service\FormAnnotationBuilderFactory',
7574
'FormElementManager' => 'Zend\Mvc\Service\FormElementManagerFactory',
7675
'HttpExceptionStrategy' => HttpExceptionStrategyFactory::class,

0 commit comments

Comments
 (0)