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

Commit

Permalink
Merge 23f8d17 into 31c649d
Browse files Browse the repository at this point in the history
  • Loading branch information
alextech committed Dec 12, 2018
2 parents 31c649d + 23f8d17 commit fa8ddf3
Show file tree
Hide file tree
Showing 6 changed files with 481 additions and 173 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Expand Up @@ -16,13 +16,16 @@ matrix:
- php: 5.6
env:
- DEPS=lowest
- REMOVE_DEV_DEPS="psr/http-factory"
- php: 5.6
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- REMOVE_DEV_DEPS="psr/http-factory"
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-crypt psr/http-factory"
- php: 5.6
env:
- DEPS=latest
- REMOVE_DEV_DEPS="psr/http-factory"
- php: 7
env:
- DEPS=lowest
Expand Down Expand Up @@ -56,6 +59,7 @@ matrix:

before_install:
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
- if [[ $REMOVE_DEV_DEPS != '' ]]; then travis_retry composer remove $COMPOSER_ARGS --dev --no-update $REMOVE_DEV_DEPS ; fi

install:
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -6,6 +6,9 @@ All notable changes to this project will be documented in this file, in reverse

### Added

- [#70](https://github.com/zendframework/zend-inputfilter/pull/70) Adds compatibility with the PSR-7 `UploadedFileInterface` to the
`RenameUpload` filter.

- [#71](https://github.com/zendframework/zend-filter/pull/71) adds the `ToFloat` filter, to complement the `ToInt` filter.

- [#69](https://github.com/zendframework/zend-filter/pull/69) adds `Zend\Filter\StringSufix`; when provided with a string `suffix`
Expand Down
2 changes: 2 additions & 0 deletions composer.json
Expand Up @@ -22,12 +22,14 @@
"require-dev": {
"pear/archive_tar": "^1.4.3",
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
"psr/http-factory": "^1.0",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-crypt": "^3.2.1",
"zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
"zendframework/zend-uri": "^2.6"
},
"suggest": {
"psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters",
"zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
"zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
"zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
Expand Down

0 comments on commit fa8ddf3

Please sign in to comment.