Merge pull request #12 from akrabat/psr-15

Support PSR-15 Middlware Interface

Author: akrabat

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "akrabat/proxy-detection-middleware",
-    "description": "PSR-7 Middleware that determines the scheme, host and port from the 'X-Forwarded-Proto', 'X-Forwarded-Host' and 'X-Forwarded-Port' headers and updates the Request's Uri object.",
+    "description": "PSR-7/PSR-15 Middleware that determines the scheme, host and port from the 'X-Forwarded-Proto', 'X-Forwarded-Host' and 'X-Forwarded-Port' headers and updates the Request's Uri object.",
     "keywords": [
         "psr7", "middleware", "ip"
     ],
@@ -15,7 +15,8 @@
         }
     ],
     "require": {
-        "psr/http-message": "^1.0"
+        "psr/http-message": "^1.0",
+        "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
         "php": "^8.0",

composer.lock

@@ -4,8 +4,10 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\UriInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
-class ProxyDetection
+class ProxyDetection implements MiddlewareInterface
 {
     /**
      * List of trusted proxy IP addresses
@@ -27,6 +29,11 @@ public function __construct($trustedProxies = [])
         $this->trustedProxies = $trustedProxies;
     }
 
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        return $handler->handle($this->updateRequest($request));
+    }
+
     /**
      * Override the request URI's scheme, host and port as determined from the proxy headers
      *
@@ -41,7 +48,12 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
         if (!$next) {
             return $response;
         }
-        
+
+        return $next($this->updateRequest($request), $response);
+    }
+
+    protected function updateRequest(ServerRequestInterface $request): ServerRequestInterface
+    {
         if (!empty($this->trustedProxies)) {
             // get IP address from REMOTE_ADDR
             $ipAddress = null;
@@ -51,7 +63,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
             }
 
             if (!in_array($ipAddress, $this->trustedProxies)) {
-                return $response = $next($request, $response);
+                return $request;
             }
         }
 
@@ -61,9 +73,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
         $uri = $this->processPortHeader($request, $uri);
         $uri = $this->processHostHeader($request, $uri);
 
-        $request = $request->withUri($uri);
-
-        return $response = $next($request, $response);
+        return $request->withUri($uri);
     }
 
     /**