Merge "CSP: In tests, use setMwGlobals() instead of manual set+undo"

[lhc/web/wiklou.git] / includes / session / CookieSessionProvider.php

diff --git a/includes/session/CookieSessionProvider.php b/includes/session/CookieSessionProvider.php
index 79fc720..aaa522a 100644 (file)
--- a/includes/session/CookieSessionProvider.php
+++ b/includes/session/CookieSessionProvider.php
@@ -339,7 +339,7 @@ class CookieSessionProvider extends SessionProvider {
         * @param \WebRequest $request
         * @param string $key
         * @param string $prefix
-        * @param mixed $default
+        * @param mixed|null $default
         * @return mixed
         */
        protected function getCookie( $request, $key, $prefix, $default = null ) {
@@ -420,7 +420,7 @@ class CookieSessionProvider extends SessionProvider {
         * Cookies that are session-length do not call this function.
         *
         * @param string $cookieName
-        * @param boolean $shouldRememberUser Whether the user should be remembered
+        * @param bool $shouldRememberUser Whether the user should be remembered
         *   long-term
         * @return int Cookie expiration time in seconds; 0 for session cookies
         */