Merge pull request #18619 from kamil-tekiela/setCookieParams

MauricioFauth · web-flow · commit 839c078405b6 · 2023-08-15T00:31:28.000-03:00
Remove unnecessary closure
diff --git a/libraries/classes/Plugins/Auth/AuthenticationSignon.php b/libraries/classes/Plugins/Auth/AuthenticationSignon.php
@@ -63,23 +63,17 @@ public function setCookieParams(array|null $sessionCookieParams = null): void
             $sessionCookieParams = (array) $GLOBALS['cfg']['Server']['SignonCookieParams'];
         }
 
-        /* Sanitize cookie params */
-        $defaultCookieParams = /** @return mixed */ static function (string $key) {
-            return match ($key) {
-                'lifetime' => 0,
-                'path' => '/',
-                'domain' => '',
-                'secure', 'httponly' => false,
-                default => null,
-            };
-        };
-
         foreach (['lifetime', 'path', 'domain', 'secure', 'httponly'] as $key) {
             if (isset($sessionCookieParams[$key])) {
                 continue;
             }
 
-            $sessionCookieParams[$key] = $defaultCookieParams($key);
+            $sessionCookieParams[$key] = match ($key) {
+                'lifetime' => 0,
+                'path' => '/',
+                'domain' => '',
+                'secure', 'httponly' => false,
+            };
         }
 
         if (
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -8110,7 +8110,6 @@
       <code><![CDATA[$_SESSION['LAST_SIGNON_URL']]]></code>
       <code>$hmacSecret</code>
       <code>$pmaToken</code>
-      <code>$sessionCookieParams[$key]</code>
       <code>$singleSignonCfgUpdate</code>
       <code>$singleSignonHost</code>
       <code>$singleSignonPort</code>
