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

Commit

Permalink
Merge branch 'hotfix/160'
Browse files Browse the repository at this point in the history
Close #160
Fixes #119
  • Loading branch information
weierophinney committed Jan 22, 2018
2 parents 19a47eb + 621f854 commit 1e365e9
Show file tree
Hide file tree
Showing 3 changed files with 139 additions and 132 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- [#160](https://github.com/zendframework/zend-inputfilter/pull/160) adds
zend-servicemanager as a direct requirement, rather than a suggestion. The
package has not worked without it since [#67](https://github.com/zendframework/zend-inputfilter/pull/67)
was merged for the 2.6.1 release.

- [#161](https://github.com/zendframework/zend-inputfilter/pull/161) fixes an
issue whereby an input filter receiving a `null` value to `setData()` would
raise an exception, instead of being treated as an empty data set.
Expand Down
9 changes: 3 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,12 @@
"php": "^5.6 || ^7.0",
"zendframework/zend-filter": "^2.6",
"zendframework/zend-stdlib": "^2.7 || ^3.0",
"zendframework/zend-validator": "^2.10.1"
"zendframework/zend-validator": "^2.10.1",
"zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1"
},
"require-dev": {
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
},
"suggest": {
"zendframework/zend-servicemanager": "To support plugin manager support"
"zendframework/zend-coding-standard": "~1.0.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 1e365e9

Please sign in to comment.