Merge "Prevent fatal PHP errors when PageRestriction::getTitle() returns null."

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

diff --git a/includes/session/SessionManager.php b/includes/session/SessionManager.php
index 40a568f..385cc35 100644 (file)
--- a/includes/session/SessionManager.php
+++ b/includes/session/SessionManager.php
@@ -32,6 +32,7 @@ use Config;
 use FauxRequest;
 use User;
 use WebRequest;
+use Wikimedia\ObjectFactory;
 
 /**
  * This serves as the entry point to the MediaWiki session handling system.
@@ -376,23 +377,6 @@ final class SessionManager implements SessionManagerInterface {
         * @{
         */
 
-       /**
-        * Auto-create the given user, if necessary
-        * @private Don't call this yourself. Let Setup.php do it for you at the right time.
-        * @deprecated since 1.27, use MediaWiki\Auth\AuthManager::autoCreateUser instead
-        * @param User $user User to auto-create
-        * @return bool Success
-        * @codeCoverageIgnore
-        */
-       public static function autoCreateUser( User $user ) {
-               wfDeprecated( __METHOD__, '1.27' );
-               return \MediaWiki\Auth\AuthManager::singleton()->autoCreateUser(
-                       $user,
-                       \MediaWiki\Auth\AuthManager::AUTOCREATE_SOURCE_SESSION,
-                       false
-               )->isGood();
-       }
-
        /**
         * Prevent future sessions for the user
         *
@@ -429,7 +413,7 @@ final class SessionManager implements SessionManagerInterface {
                if ( $this->sessionProviders === null ) {
                        $this->sessionProviders = [];
                        foreach ( $this->config->get( 'SessionProviders' ) as $spec ) {
-                               $provider = \ObjectFactory::getObjectFromSpec( $spec );
+                               $provider = ObjectFactory::getObjectFromSpec( $spec );
                                $provider->setLogger( $this->logger );
                                $provider->setConfig( $this->config );
                                $provider->setManager( $this );
@@ -454,7 +438,7 @@ final class SessionManager implements SessionManagerInterface {
         */
        public function getProvider( $name ) {
                $providers = $this->getProviders();
-               return isset( $providers[$name] ) ? $providers[$name] : null;
+               return $providers[$name] ?? null;
        }
 
        /**