Merge pull request #54 from zf-fr/feature/http-middleware-0.5

Add support for http-interop/http-middleware 0.5
zf-fr · Oct 23, 2017 · 679e248 · 679e248
2 parents cf0dfb2 + f706c53
commit 679e248
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 6.1.0
+
+Add support for http-interop/http-middleware 0.5
+
 # 6.0.3
 
 * Fix another issue with validating Docker IP :D.

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "aws/aws-sdk-php": "^3.0",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0",
-        "http-interop/http-middleware": "^0.4.1"
+        "webimpress/http-middleware-compatibility": "^0.1.4"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.1",

diff --git a/src/Listener/SilentFailingListener.php b/src/Listener/SilentFailingListener.php
@@ -2,9 +2,9 @@
 
 namespace ZfrEbWorker\Listener;
 
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Webimpress\HttpMiddlewareCompatibility\HandlerInterface as DelegateInterface;
+use Webimpress\HttpMiddlewareCompatibility\MiddlewareInterface;
 use Zend\Diactoros\Response\EmptyResponse;
 
 /**

diff --git a/src/Middleware/WorkerMiddleware.php b/src/Middleware/WorkerMiddleware.php
@@ -18,11 +18,11 @@
 
 namespace ZfrEbWorker\Middleware;
 
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Webimpress\HttpMiddlewareCompatibility\HandlerInterface as DelegateInterface;
+use Webimpress\HttpMiddlewareCompatibility\MiddlewareInterface;
 use ZfrEbWorker\Exception\InvalidArgumentException;
 use ZfrEbWorker\Exception\RuntimeException;
 

diff --git a/test/Listener/SilentFailingListenerTest.php b/test/Listener/SilentFailingListenerTest.php
@@ -2,8 +2,8 @@
 
 namespace ZfrEbWorkerTest\Listener;
 
-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Webimpress\HttpMiddlewareCompatibility\HandlerInterface as DelegateInterface;
 use ZfrEbWorker\Listener\SilentFailingListener;
 
 /**

diff --git a/test/Middleware/WorkerMiddlewareTest.php b/test/Middleware/WorkerMiddlewareTest.php
@@ -19,12 +19,12 @@
 namespace ZfrEbWorkerTest\Middleware;
 
 use DateTimeImmutable;
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Prophecy\Argument;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Webimpress\HttpMiddlewareCompatibility\HandlerInterface as DelegateInterface;
+use Webimpress\HttpMiddlewareCompatibility\MiddlewareInterface;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\Stream;