Merge pull request #4 from rstgroup/psr-15

Add psr-15 support

README.md

@@ -43,6 +43,6 @@ Use [Expressive Configuration Manager](https://github.com/mtymek/expressive-conf
 After this you can enable middleware in your middleware-stack using `RstGroup\HttpMethodOverride\HttpMethodOverrideMiddleware`
 service name in your container.
 
-### Specific installation for Zend Framework 2
+### Specific installation for Zend Framework 2 & 3
 
 Add module `RstGroup\HttpMethodOverride` to `application.config.php` file.

composer.json

@@ -21,14 +21,18 @@
         "zendframework/zend-eventmanager": "^2.4 || ^3.0",
         "zendframework/zend-mvc": "^2.4 || ^3.0",
         "zendframework/zend-diactoros": "^1.3.3",
-        "zendframework/zend-modulemanager": "^2.4"
+        "zendframework/zend-modulemanager": "^2.4",
+        "php-middleware/double-pass-compatibility": "^1.0",
+        "http-interop/http-middleware": "^0.4.1"
     },
     "suggest": {
         "zendframework/zend-http": "To use rstgroup/http-method-override as ZF module",
         "zendframework/zend-eventmanager": "To use rstgroup/http-method-override as ZF module",
         "zendframework/zend-mvc": "To use rstgroup/http-method-override as ZF module",
         "zendframework/zend-modulemanager": "To use rstgroup/http-method-override as ZF module",
-        "psr/http-message": "To use rstgroup/http-method-override as middleware"
+        "psr/http-message": "To use rstgroup/http-method-override as middleware",
+        "php-middleware/double-pass-compatibility": "To use rstgroup/http-method-override as middleware",
+        "http-interop/http-middleware": "To use rstgroup/http-method-override as middleware"
     },
     "autoload": {
         "psr-4": {

src/HttpMethodOverrideMiddleware.php

@@ -2,26 +2,23 @@
 
 namespace RstGroup\HttpMethodOverride;
 
-use Psr\Http\Message\ResponseInterface;
+use Interop\Http\ServerMiddleware\DelegateInterface;
+use Interop\Http\ServerMiddleware\MiddlewareInterface;
+use PhpMiddleware\DoublePassCompatibilityTrait;
 use Psr\Http\Message\ServerRequestInterface;
 
-final class HttpMethodOverrideMiddleware
+final class HttpMethodOverrideMiddleware implements MiddlewareInterface
 {
+    use DoublePassCompatibilityTrait;
+
     private $service;
 
     public function __construct(HttpMethodOverrideService $service)
     {
         $this->service = $service;
     }
 
-    /**
-     * @param ServerRequestInterface $request
-     * @param ResponseInterface $response
-     * @param callable $next
-     *
-     * @return $response
-     */
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next)
+    public function process(ServerRequestInterface $request, DelegateInterface $delegate)
     {
         $method = $request->getMethod();
         $headers = $this->getHeadersFromRequest($request);
@@ -32,7 +29,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
             $request = $request->withMethod($overridedHeader);
         }
 
-        return $next($request, $response);
+        return $delegate->process($request);
     }
 
     /**
@@ -51,4 +48,4 @@ private function getHeadersFromRequest(ServerRequestInterface $request)
         }
         return $headerNames;
     }
-}
+}