diff --git a/composer.json b/composer.json index 5d96150..8cecde7 100644 --- a/composer.json +++ b/composer.json @@ -5,10 +5,10 @@ "license": "MIT", "require": { "php": "^7.0", - "http-interop/http-server-middleware": "^1.0", "recoil/react": "^1.0", "recoil/recoil": "^1.0", - "nikic/php-parser": "^3.1" + "nikic/php-parser": "^3.1", + "psr/http-server-middleware": "^1.0" }, "require-dev": { "phpunit/phpunit": "^6.0", diff --git a/src/GroupedPSR15Middleware.php b/src/GroupedPSR15Middleware.php index aec64b7..3a9e4c0 100644 --- a/src/GroupedPSR15Middleware.php +++ b/src/GroupedPSR15Middleware.php @@ -2,9 +2,9 @@ namespace FriendsOfReact\Http\Middleware\Psr15Adapter; -use Interop\Http\Server\MiddlewareInterface as PSR15MiddlewareInterface; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\MiddlewareInterface as PSR15MiddlewareInterface; use React\EventLoop\LoopInterface; use React\Promise; use Recoil\React\ReactKernel; diff --git a/src/PSR15Middleware.php b/src/PSR15Middleware.php index abf89cc..371bf7e 100644 --- a/src/PSR15Middleware.php +++ b/src/PSR15Middleware.php @@ -2,9 +2,9 @@ namespace FriendsOfReact\Http\Middleware\Psr15Adapter; -use Interop\Http\Server\MiddlewareInterface as PSR15MiddlewareInterface; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\MiddlewareInterface as PSR15MiddlewareInterface; use React\EventLoop\LoopInterface; use React\Promise; use Recoil\React\ReactKernel; diff --git a/src/YieldingMiddlewareFactory.php b/src/YieldingMiddlewareFactory.php index 1feff2e..9ba37d9 100644 --- a/src/YieldingMiddlewareFactory.php +++ b/src/YieldingMiddlewareFactory.php @@ -2,7 +2,6 @@ namespace FriendsOfReact\Http\Middleware\Psr15Adapter; -use Interop\Http\Server\MiddlewareInterface as PSR15MiddlewareInterface; use PhpParser\Node\Expr\MethodCall; use PhpParser\Node\Expr\Variable; use PhpParser\Node\Expr\Yield_; @@ -10,6 +9,7 @@ use PhpParser\Node\Stmt\ClassMethod; use PhpParser\ParserFactory; use PhpParser\PrettyPrinter\Standard; +use Psr\Http\Server\MiddlewareInterface as PSR15MiddlewareInterface; final class YieldingMiddlewareFactory { diff --git a/tests/PSR15TestMiddleware.php b/tests/PSR15TestMiddleware.php index 799e268..dbe7463 100644 --- a/tests/PSR15TestMiddleware.php +++ b/tests/PSR15TestMiddleware.php @@ -2,10 +2,10 @@ namespace FriendsOfReact\Tests\Http\Middleware\Psr15Adapter; -use Interop\Http\Server\MiddlewareInterface as PSR15MiddlewareInterface; -use Interop\Http\Server\RequestHandlerInterface; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\MiddlewareInterface as PSR15MiddlewareInterface; +use Psr\Http\Server\RequestHandlerInterface; final class PSR15TestMiddleware implements PSR15MiddlewareInterface {