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

Commit

Permalink
Make PSR-7 an OPTIONAL dependency
Browse files Browse the repository at this point in the history
File filters are a minority use case of the component, and adding a
dependency on psr/http-message and zendframework/zend-diactoros is
overkill if you are not using them. As such, I have made
psr/http-message-implementation a suggested dependency, and
zendframework/zend-diactoros a development dependency.

I have also allowed either the 1.X or 2.X series of Diactoros, as they
both fulfill PSR-7.

Finally, to allow tests to run against 5.6 and 7.0, I have added
Diactoros as a legacy dependency, so that the 1.X version can be
installed.
  • Loading branch information
weierophinney committed Dec 12, 2018
1 parent c754d6c commit d34597b
Show file tree
Hide file tree
Showing 3 changed files with 173 additions and 173 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ matrix:
- php: 5.6
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-diactoros"
- php: 5.6
env:
- DEPS=latest
Expand All @@ -29,7 +29,7 @@ matrix:
- php: 7
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-diactoros"
- php: 7
env:
- DEPS=latest
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
},
"require": {
"php": "^5.6 || ^7.0",
"psr/http-message": "^1.0",
"zendframework/zend-diactoros": "^2.0",
"zendframework/zend-stdlib": "^2.7.7 || ^3.1"
},
"require-dev": {
"pear/archive_tar": "^1.4.3",
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-crypt": "^3.2.1",
"zendframework/zend-diactoros": "^1.8.6 || ^2.0.1",
"zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
"zendframework/zend-uri": "^2.6"
},
"suggest": {
"psr/http-message-implementation": "psr/http-message-implementation, for supporting file upload filters when using PSR-7",
"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
338 changes: 169 additions & 169 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d34597b

Please sign in to comment.