Merge "registration: Avoid redundant LBYL check in ExtensionRegistry::queue()"

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

diff --git a/includes/session/SessionManager.php b/includes/session/SessionManager.php
index 3810565..09cdf72 100644 (file)
--- a/includes/session/SessionManager.php
+++ b/includes/session/SessionManager.php
@@ -86,8 +86,7 @@ final class SessionManager implements SessionManagerInterface {
 
        /**
         * Get the global SessionManager
-        * @return SessionManagerInterface
-        *  (really a SessionManager, but this is to make IDEs less confused)
+        * @return self
         */
        public static function singleton() {
                if ( self::$instance === null ) {
@@ -321,6 +320,7 @@ final class SessionManager implements SessionManagerInterface {
 
        public function getVaryHeaders() {
                // @codeCoverageIgnoreStart
+               // @phan-suppress-next-line PhanUndeclaredConstant
                if ( defined( 'MW_NO_SESSION' ) && MW_NO_SESSION !== 'warn' ) {
                        return [];
                }
@@ -341,6 +341,7 @@ final class SessionManager implements SessionManagerInterface {
 
        public function getVaryCookies() {
                // @codeCoverageIgnoreStart
+               // @phan-suppress-next-line PhanUndeclaredConstant
                if ( defined( 'MW_NO_SESSION' ) && MW_NO_SESSION !== 'warn' ) {
                        return [];
                }
@@ -410,6 +411,7 @@ final class SessionManager implements SessionManagerInterface {
                                $provider->setConfig( $this->config );
                                $provider->setManager( $this );
                                if ( isset( $this->sessionProviders[(string)$provider] ) ) {
+                                       // @phan-suppress-next-line PhanTypeSuspiciousStringExpression
                                        throw new \UnexpectedValueException( "Duplicate provider name \"$provider\"" );
                                }
                                $this->sessionProviders[(string)$provider] = $provider;
@@ -814,6 +816,7 @@ final class SessionManager implements SessionManagerInterface {
        public function getSessionFromInfo( SessionInfo $info, WebRequest $request ) {
                // @codeCoverageIgnoreStart
                if ( defined( 'MW_NO_SESSION' ) ) {
+                       // @phan-suppress-next-line PhanUndeclaredConstant
                        if ( MW_NO_SESSION === 'warn' ) {
                                // Undocumented safety case for converting existing entry points
                                $this->logger->error( 'Sessions are supposed to be disabled for this entry point', [
@@ -939,6 +942,6 @@ final class SessionManager implements SessionManagerInterface {
                self::$globalSessionRequest = null;
        }
 
-       /**@}*/
+       /** @} */
 
 }