This repository has been archived by the owner on Jan 29, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hotfix/143-cleanup' into release-3.0.0
Close #143
- Loading branch information
Showing
31 changed files
with
482 additions
and
374 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| /docs export-ignore | ||
| /test export-ignore | ||
| /.coveralls.yml export-ignore | ||
| /.docheader export-ignore | ||
| /.gitattributes export-ignore | ||
| /.gitignore export-ignore | ||
| /.travis.yml export-ignore | ||
| /composer.lock export-ignore | ||
| /docs/ export-ignore | ||
| /mkdocs.yml export-ignore | ||
| /phpcs.xml export-ignore | ||
| /phpunit.xml.dist export-ignore | ||
| /test/ export-ignore |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| vendor/ | ||
| phpunit.xml | ||
| docs/html/ | ||
| zf-mkdoc-theme/ | ||
| clover.xml | ||
| coveralls-upload.json | ||
| /clover.xml | ||
| /coveralls-upload.json | ||
| /docs/html/ | ||
| /phpunit.xml | ||
| /vendor/ | ||
| /zf-mkdoc-theme.tgz | ||
| /zf-mkdoc-theme/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,27 @@ | ||
| Copyright (c) 2015-2016, Zend Technologies USA, Inc. | ||
| Copyright (c) 2015-2018, Zend Technologies USA, Inc. | ||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: | ||
| Redistribution and use in source and binary forms, with or without modification, | ||
| are permitted provided that the following conditions are met: | ||
|
|
||
| - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. | ||
| - Redistributions of source code must retain the above copyright notice, this | ||
| list of conditions and the following disclaimer. | ||
|
|
||
| - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. | ||
| - Redistributions in binary form must reproduce the above copyright notice, this | ||
| list of conditions and the following disclaimer in the documentation and/or | ||
| other materials provided with the distribution. | ||
|
|
||
| - Neither the name of Zend Technologies USA, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. | ||
| - Neither the name of Zend Technologies USA, Inc. nor the names of its | ||
| contributors may be used to endorse or promote products derived from this | ||
| software without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
| ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR | ||
| ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,73 @@ | ||
| { | ||
| "name": "zendframework/zend-stratigility", | ||
| "description": "Middleware for PHP", | ||
| "type": "library", | ||
| "license": "BSD-3-Clause", | ||
| "keywords": [ | ||
| "http", | ||
| "psr-7", | ||
| "middleware", | ||
| "zf", | ||
| "zendframework" | ||
| ], | ||
| "homepage": "https://github.com/zendframework/zend-stratigility", | ||
| "support": { | ||
| "docs": "https://docs.zendframework.com/zend-stratigility/", | ||
| "issues": "https://github.com/zendframework/zend-stratigility/issues", | ||
| "source": "https://github.com/zendframework/zend-stratigility", | ||
| "rss": "https://github.com/zendframework/zend-stratigility/releases.atom", | ||
| "slack": "https://zendframework-slack.herokuapp.com", | ||
| "forum": "https://discourse.zendframework.com/c/questions/expressive" | ||
| }, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "2.1.x-dev", | ||
| "dev-develop": "2.2.x-dev", | ||
| "dev-release-3.0.0": "3.0.x-dev" | ||
| } | ||
| }, | ||
| "config": { | ||
| "sort-packages": true | ||
| }, | ||
| "require": { | ||
| "php": "^7.1", | ||
| "http-interop/http-server-middleware": "^1.0.1", | ||
| "psr/http-message": "^1.0", | ||
| "zendframework/zend-escaper": "^2.3" | ||
| }, | ||
| "require-dev": { | ||
| "malukenho/docheader": "^0.1.5", | ||
| "phpunit/phpunit": "^5.7.22 || ^6.4.1", | ||
| "zendframework/zend-coding-standard": "~1.0.0", | ||
| "zendframework/zend-diactoros": "^1.0" | ||
| }, | ||
| "suggest": { | ||
| "psr/http-message-implementation": "Please install a psr/http-message-implementation to consume Stratigility; e.g., zendframework/zend-diactoros" | ||
| }, | ||
| "autoload": { | ||
| "files": [ | ||
| "src/functions/double-pass-middleware.php", | ||
| "src/functions/host.php", | ||
| "src/functions/middleware.php", | ||
| "src/functions/path.php" | ||
| "name": "zendframework/zend-stratigility", | ||
| "description": "PSR-7 middleware foundation for building and dispatching middleware pipelines", | ||
| "license": "BSD-3-Clause", | ||
| "keywords": [ | ||
| "http", | ||
| "psr-7", | ||
| "middleware", | ||
| "zf", | ||
| "zendframework" | ||
| ], | ||
| "psr-4": { | ||
| "Zend\\Stratigility\\": "src/" | ||
| } | ||
| }, | ||
| "autoload-dev": { | ||
| "psr-4": { | ||
| "ZendTest\\Stratigility\\": "test/" | ||
| "support": { | ||
| "docs": "https://docs.zendframework.com/zend-stratigility/", | ||
| "issues": "https://github.com/zendframework/zend-stratigility/issues", | ||
| "source": "https://github.com/zendframework/zend-stratigility", | ||
| "rss": "https://github.com/zendframework/zend-stratigility/releases.atom", | ||
| "slack": "https://zendframework-slack.herokuapp.com", | ||
| "forum": "https://discourse.zendframework.com/c/questions/expressive" | ||
| }, | ||
| "require": { | ||
| "php": "^7.1", | ||
| "http-interop/http-server-middleware": "^1.1.1", | ||
| "psr/http-message": "^1.0", | ||
| "zendframework/zend-escaper": "^2.3" | ||
| }, | ||
| "require-dev": { | ||
| "malukenho/docheader": "^0.1.6", | ||
| "phpunit/phpunit": "^6.5.5", | ||
| "zendframework/zend-coding-standard": "~1.0.0", | ||
| "zendframework/zend-diactoros": "^1.0" | ||
| }, | ||
| "suggest": { | ||
| "psr/http-message-implementation": "Please install a psr/http-message-implementation to consume Stratigility; e.g., zendframework/zend-diactoros" | ||
| }, | ||
| "autoload": { | ||
| "files": [ | ||
| "src/functions/double-pass-middleware.php", | ||
| "src/functions/host.php", | ||
| "src/functions/middleware.php", | ||
| "src/functions/path.php" | ||
| ], | ||
| "psr-4": { | ||
| "Zend\\Stratigility\\": "src/" | ||
| } | ||
| }, | ||
| "autoload-dev": { | ||
| "psr-4": { | ||
| "ZendTest\\Stratigility\\": "test/" | ||
| } | ||
| }, | ||
| "config": { | ||
| "sort-packages": true | ||
| }, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "3.0-dev", | ||
| "dev-develop": "3.1-dev", | ||
| "dev-release-3.0.0": "3.0.x-dev" | ||
| } | ||
| }, | ||
| "scripts": { | ||
| "check": [ | ||
| "@license-check", | ||
| "@cs-check", | ||
| "@test" | ||
| ], | ||
| "cs-check": "phpcs", | ||
| "cs-fix": "phpcbf", | ||
| "test": "phpunit --colors=always", | ||
| "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", | ||
| "license-check": "docheader check src/ test/" | ||
| } | ||
| }, | ||
| "scripts": { | ||
| "check": [ | ||
| "@license-check", | ||
| "@cs-check", | ||
| "@test" | ||
| ], | ||
| "cs-check": "phpcs", | ||
| "cs-fix": "phpcbf", | ||
| "license-check": "docheader check src/ test/", | ||
| "test": "phpunit --colors=always", | ||
| "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", | ||
| "upload-coverage": "coveralls -v" | ||
| } | ||
| } |
Oops, something went wrong.