Merge "Allow users who are partially blocked to delete revisions."

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

diff --git a/includes/session/ImmutableSessionProviderWithCookie.php b/includes/session/ImmutableSessionProviderWithCookie.php
index 98f7e5c..149bb80 100644 (file)
--- a/includes/session/ImmutableSessionProviderWithCookie.php
+++ b/includes/session/ImmutableSessionProviderWithCookie.php
@@ -41,7 +41,8 @@ abstract class ImmutableSessionProviderWithCookie extends SessionProvider {
 
        /** @var string|null */
        protected $sessionCookieName = null;
-       protected $sessionCookieOptions = array();
+       /** @var mixed[] */
+       protected $sessionCookieOptions = [];
 
        /**
         * @param array $params Keys include:
@@ -49,7 +50,7 @@ abstract class ImmutableSessionProviderWithCookie extends SessionProvider {
         *    client are to be supported.
         *  - sessionCookieOptions: Options to pass to WebResponse::setCookie().
         */
-       public function __construct( $params = array() ) {
+       public function __construct( $params = [] ) {
                parent::__construct();
 
                if ( isset( $params['sessionCookieName'] ) ) {
@@ -84,9 +85,7 @@ abstract class ImmutableSessionProviderWithCookie extends SessionProvider {
                        );
                }
 
-               $prefix = isset( $this->sessionCookieOptions['prefix'] )
-                       ? $this->sessionCookieOptions['prefix']
-                       : $this->config->get( 'CookiePrefix' );
+               $prefix = $this->sessionCookieOptions['prefix'] ?? $this->config->get( 'CookiePrefix' );
                $id = $request->getCookie( $this->sessionCookieName, $prefix );
                return SessionManager::validateSessionId( $id ) ? $id : null;
        }
@@ -113,8 +112,8 @@ abstract class ImmutableSessionProviderWithCookie extends SessionProvider {
 
                $options = $this->sessionCookieOptions;
                if ( $session->shouldForceHTTPS() || $session->getUser()->requiresHTTPS() ) {
-                       $response->setCookie( 'forceHTTPS', 'true', $session->shouldRememberUser() ? 0 : null,
-                               array( 'prefix' => '', 'secure' => false ) + $options );
+                       $response->setCookie( 'forceHTTPS', 'true', null,
+                               [ 'prefix' => '', 'secure' => false ] + $options );
                        $options['secure'] = true;
                }
 
@@ -138,13 +137,11 @@ abstract class ImmutableSessionProviderWithCookie extends SessionProvider {
 
        public function getVaryCookies() {
                if ( $this->sessionCookieName === null ) {
-                       return array();
+                       return [];
                }
 
-               $prefix = isset( $this->sessionCookieOptions['prefix'] )
-                       ? $this->sessionCookieOptions['prefix']
-                       : $this->config->get( 'CookiePrefix' );
-               return array( $prefix . $this->sessionCookieName );
+               $prefix = $this->sessionCookieOptions['prefix'] ?? $this->config->get( 'CookiePrefix' );
+               return [ $prefix . $this->sessionCookieName ];
        }
 
        public function whyNoSession() {