Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use approved PSR-15 #13

Merged
merged 3 commits into from
Jan 26, 2018
Merged

Use approved PSR-15 #13

merged 3 commits into from
Jan 26, 2018

Conversation

tuupola
Copy link
Contributor

@tuupola tuupola commented Jan 23, 2018

This PR switches to the approved version of PSR-15.

@tuupola
Copy link
Contributor Author

tuupola commented Jan 23, 2018

Build with 7.2 and nightly fails but the warnings seem not to be related to this PR. Something to do with eloquent/phony instead.

@shadowhand shadowhand mentioned this pull request Jan 23, 2018
Copy link
Contributor

@shadowhand shadowhand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you rebase this to master branch it will fix the build.

src/Handler.php Outdated
@@ -2,7 +2,7 @@

namespace Equip\Dispatch;

use Interop\Http\Server\RequestHandlerInterface;
use Psr\Http\Server\RequestHandlerInterface;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should go after Psr\Http\Message for alphabetical listing.

@@ -2,7 +2,7 @@

namespace Equip\Dispatch;

use Interop\Http\Server\RequestHandlerInterface;
use Psr\Http\Server\RequestHandlerInterface;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also here and elsewhere.

@@ -4,7 +4,7 @@

use Eloquent\Phony\Mock\Handle\InstanceHandle;
use Eloquent\Phony\Phpunit\Phony;
use Interop\Http\Server\MiddlewareInterface;
use Psr\Http\Server\MiddlewareInterface;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, alpha ordering of use statements.

@tuupola
Copy link
Contributor Author

tuupola commented Jan 23, 2018

Uh. Somehow I failed the rebase and did normal merge from master with fixed conflict. The extra commit message could be hidden with squash merging the PR if needed?

@shadowhand
Copy link
Contributor

Thanks. I'll try to get this merged in later today and tagged.

@tuupola
Copy link
Contributor Author

tuupola commented Jan 23, 2018

Super. Thanks!

@shadowhand shadowhand merged commit 5cb6852 into equip:master Jan 26, 2018
@shadowhand
Copy link
Contributor

Tagged as version 2.0.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants