Merge pull request #11 from basz/psr/http-server-middleware

cs
prooph · Jan 23, 2018 · 607707b · 607707b
2 parents dcfc567 + b276e16
commit 607707b
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/src/CommandMiddleware.php b/src/CommandMiddleware.php
@@ -13,14 +13,14 @@
 namespace Prooph\HttpMiddleware;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use Prooph\Common\Messaging\MessageFactory;
 use Prooph\HttpMiddleware\Exception\RuntimeException;
 use Prooph\HttpMiddleware\Response\ResponseStrategy;
 use Prooph\ServiceBus\CommandBus;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 /**
  * Command messages describe actions your model can handle.

diff --git a/src/EventMiddleware.php b/src/EventMiddleware.php
@@ -13,14 +13,14 @@
 namespace Prooph\HttpMiddleware;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use Prooph\Common\Messaging\MessageFactory;
 use Prooph\HttpMiddleware\Exception\RuntimeException;
 use Prooph\HttpMiddleware\Response\ResponseStrategy;
 use Prooph\ServiceBus\EventBus;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 /**
  * Event messages describe things that happened while your model handled a command.

diff --git a/src/MessageMiddleware.php b/src/MessageMiddleware.php
@@ -13,8 +13,6 @@
 namespace Prooph\HttpMiddleware;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use Prooph\Common\Messaging\Message;
 use Prooph\Common\Messaging\MessageDataAssertion;
 use Prooph\Common\Messaging\MessageFactory;
@@ -25,6 +23,8 @@
 use Prooph\ServiceBus\QueryBus;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Ramsey\Uuid\Uuid;
 
 /**

diff --git a/src/QueryMiddleware.php b/src/QueryMiddleware.php
@@ -14,14 +14,14 @@
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use Prooph\Common\Messaging\MessageFactory;
 use Prooph\HttpMiddleware\Exception\RuntimeException;
 use Prooph\HttpMiddleware\Response\ResponseStrategy;
 use Prooph\ServiceBus\QueryBus;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 /**
  * Query messages describe available information that can be fetched from your (read) model.

diff --git a/tests/CommandMiddlewareTest.php b/tests/CommandMiddlewareTest.php
@@ -13,7 +13,6 @@
 namespace ProophTest\HttpMiddleware;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use PHPUnit\Framework\TestCase;
 use Prooph\Common\Messaging\Message;
 use Prooph\Common\Messaging\MessageFactory;
@@ -25,6 +24,7 @@
 use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 /**
  * Test integrity of \Prooph\HttpMiddleware\CommandMiddleware

diff --git a/tests/EventMiddlewareTest.php b/tests/EventMiddlewareTest.php
@@ -13,7 +13,6 @@
 namespace ProophTest\HttpMiddleware;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use PHPUnit\Framework\TestCase;
 use Prooph\Common\Messaging\Message;
 use Prooph\Common\Messaging\MessageFactory;
@@ -25,6 +24,7 @@
 use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 /**
  * Test integrity of \Prooph\HttpMiddleware\EventMiddleware

diff --git a/tests/MessageMiddlewareTest.php b/tests/MessageMiddlewareTest.php
@@ -13,7 +13,6 @@
 namespace ProophTest\HttpMiddleware;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use PHPUnit\Framework\TestCase;
 use Prooph\Common\Messaging\Message;
 use Prooph\Common\Messaging\MessageFactory;
@@ -26,6 +25,7 @@
 use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use React\Promise\Promise;
 
 /**

diff --git a/tests/QueryMiddlewareTest.php b/tests/QueryMiddlewareTest.php
@@ -12,7 +12,6 @@
 
 namespace ProophTest\HttpMiddleware;
 
-use Psr\Http\Server\RequestHandlerInterface;
 use PHPUnit\Framework\TestCase;
 use Prooph\Common\Messaging\Message;
 use Prooph\Common\Messaging\MessageFactory;
@@ -24,6 +23,7 @@
 use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use React\Promise\Promise;
 
 /**