Merge branch 'v1.x' into v2.x

Author: jpresutti

Main.php

@@ -117,7 +117,7 @@ protected function buildWebArguments(RouterInterface $router): void
     protected function isJsonRequest(): bool
     {
         return isset($_SERVER['CONTENT_TYPE'])
-            && stripos((string)$_SERVER['CONTENT_TYPE'], 'application/json') !== false;
+            && stripos($_SERVER['CONTENT_TYPE'], 'application/json') !== false;
     }
 
     protected function buildInitialArguments(RouterInterface $router): void

Router/Router.php

@@ -912,7 +912,7 @@ private function getFilteredMethodName(string $methodName): string
      */
     protected function getCurrentRequestMethod(): string
     {
-        return !empty($_SERVER['REQUEST_METHOD']) ? (string)$_SERVER['REQUEST_METHOD'] : RequestMethod::GET->value;
+        return !empty($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : RequestMethod::GET->value;
     }
 
 }

Session/Session.php

@@ -65,14 +65,17 @@ public function __construct(ConfigInterface $config)
         /** @var bool $strictIp */
         $strictIp = $config->getSetting('session.strictIp', false);
         if ($strictIp) {
-            if (isset($Feast->ipAddress) && $Feast->ipAddress !== (string)$_SERVER['REMOTE_ADDR']) {
+            /** @psalm-suppress PossiblyUndefinedArrayOffset */
+            if (isset($Feast->ipAddress) && $Feast->ipAddress !== $_SERVER['REMOTE_ADDR']) {
                 session_destroy();
                 $response = di(ResponseInterface::class);
 
-                $response->redirect((string)$_SERVER['REQUEST_URI']);
+                /** @psalm-suppress PossiblyUndefinedArrayOffset */
+                $response->redirect($_SERVER['REQUEST_URI']);
             }
         }
-        $Feast->ipAddress = (string)$_SERVER['REMOTE_ADDR'];
+        /** @psalm-suppress PossiblyUndefinedArrayOffset */
+        $Feast->ipAddress = $_SERVER['REMOTE_ADDR'];
     }
 
     /**