Support latest PSR-15 #12
Merged
Conversation
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
shadowhand
suggested changes
Nov 27, 2017
src/Handler.php
Outdated
| @@ -40,7 +40,7 @@ public function __construct(array $middleware, callable $default) | |||
| * | |||
| * @return ResponseInterface | |||
| */ | |||
There was a problem hiding this comment.
Docblock can be removed now that return type is specified.
There was a problem hiding this comment.
The whole docblock or just the @return part?
src/MiddlewareCollection.php
Outdated
| @@ -76,7 +76,7 @@ public function dispatch(ServerRequestInterface $request, callable $default) | |||
| /** | |||
| * @inheritdoc | |||
| */ | |||
shadowhand
suggested changes
Nov 27, 2017
composer.json
Outdated
| @@ -11,7 +11,7 @@ | |||
| ], | |||
| "require": { | |||
| "php": ">=5.6", | |||
| "http-interop/http-middleware": "^0.5" | |||
| "http-interop/http-server-middleware": "^1.0" | |||
| }, | |||
| "require-dev": { | |||
| "phpunit/phpunit": "^4.8|^5.0", | |||
There was a problem hiding this comment.
PHP 4.x can no longer be used with PHP 7. This should be changed to ^5.7|^6.0.
composer.json
Outdated
| @@ -11,7 +11,7 @@ | |||
| ], | |||
| "require": { | |||
| "php": ">=5.6", | |||
Supporting PHPUnit 6.x requires more fiddling than just changing all instances of PHPUnit_Framework_TestCase to TestCase and probably needs a separate PR.
shadowhand
reviewed
Nov 28, 2017
composer.json
Outdated
| @@ -14,7 +14,7 @@ | |||
| "http-interop/http-server-middleware": "^1.0" | |||
| }, | |||
| "require-dev": { | |||
| "phpunit/phpunit": "^5.7|^6.0", | |||
| "phpunit/phpunit": "^5.7", | |||
There was a problem hiding this comment.
I mentioned it in the commit message, but the tests are broken with PHPUnit 6.x. This is usually fixed by simply changing all instances of PHPUnit_Framework_TestCase to TestCase. However in this case fixing the problem seems to require more fiddling and is probably better suited for separate PR.
shadowhand
approved these changes
Nov 29, 2017
|
Can we get this merged and released? I'm waiting on it. |
|
Released in v1.0.0. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds support for
http-interop/http-server-middleware: ^1.0. Also removes Travis tests for PHP 5.6 and HHVM which are not supported by the PSR anymore.