use PSR-7 for Firewall middleware

Author: mevdschee

api.include.php

@@ -7933,20 +7933,20 @@ private function isIpAllowed(string $ipAddress, string $allowedIpAddresses): boo
         }
 
         private function getIpAddress(ServerRequestInterface $request): string
-        {
-            $serverParams = $request->getServerParams();
-            return $serverParams['REMOTE_ADDR'] ?? '127.0.0.1';
-        }
-
-        public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
         {
             $reverseProxy = $this->getProperty('reverseProxy', '');
-            $serverParams = $request->getServerParams();
             if ($reverseProxy) {
                 $ipAddress = array_pop($request->getHeader('X-Forwarded-For'));
             } else {
-                $ipAddress = $this->getIpAddress($request);
+                $serverParams = $request->getServerParams();
+                $ipAddress = $serverParams['REMOTE_ADDR'] ?? '127.0.0.1';
             }
+            return $ipAddress;
+        }
+
+        public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
+        {
+            $ipAddress = $this->getIpAddress($request);
             $allowedIpAddresses = $this->getProperty('allowedIpAddresses', '');
             if (!$this->isIpAllowed($ipAddress, $allowedIpAddresses)) {
                 $response = $this->responder->error(ErrorCode::TEMPORARY_OR_PERMANENTLY_BLOCKED, '');

api.php

@@ -7933,20 +7933,20 @@ private function isIpAllowed(string $ipAddress, string $allowedIpAddresses): boo
         }
 
         private function getIpAddress(ServerRequestInterface $request): string
-        {
-            $serverParams = $request->getServerParams();
-            return $serverParams['REMOTE_ADDR'] ?? '127.0.0.1';
-        }
-
-        public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
         {
             $reverseProxy = $this->getProperty('reverseProxy', '');
-            $serverParams = $request->getServerParams();
             if ($reverseProxy) {
                 $ipAddress = array_pop($request->getHeader('X-Forwarded-For'));
             } else {
-                $ipAddress = $this->getIpAddress($request);
+                $serverParams = $request->getServerParams();
+                $ipAddress = $serverParams['REMOTE_ADDR'] ?? '127.0.0.1';
             }
+            return $ipAddress;
+        }
+
+        public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
+        {
+            $ipAddress = $this->getIpAddress($request);
             $allowedIpAddresses = $this->getProperty('allowedIpAddresses', '');
             if (!$this->isIpAllowed($ipAddress, $allowedIpAddresses)) {
                 $response = $this->responder->error(ErrorCode::TEMPORARY_OR_PERMANENTLY_BLOCKED, '');

src/Tqdev/PhpCrudApi/Middleware/FirewallMiddleware.php

@@ -37,20 +37,20 @@ private function isIpAllowed(string $ipAddress, string $allowedIpAddresses): boo
     }
 
     private function getIpAddress(ServerRequestInterface $request): string
-    {
-        $serverParams = $request->getServerParams();
-        return $serverParams['REMOTE_ADDR'] ?? '127.0.0.1';
-    }
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $reverseProxy = $this->getProperty('reverseProxy', '');
-        $serverParams = $request->getServerParams();
         if ($reverseProxy) {
             $ipAddress = array_pop($request->getHeader('X-Forwarded-For'));
         } else {
-            $ipAddress = $this->getIpAddress($request);
+            $serverParams = $request->getServerParams();
+            $ipAddress = $serverParams['REMOTE_ADDR'] ?? '127.0.0.1';
         }
+        return $ipAddress;
+    }
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
+    {
+        $ipAddress = $this->getIpAddress($request);
         $allowedIpAddresses = $this->getProperty('allowedIpAddresses', '');
         if (!$this->isIpAllowed($ipAddress, $allowedIpAddresses)) {
             $response = $this->responder->error(ErrorCode::TEMPORARY_OR_PERMANENTLY_BLOCKED, '');