Merge "Add SpecialPage::getTitleValueFor()"

diff --combined includes/specialpage/SpecialPage.php
index 99b9f33,44b8fff..00d8c4a
--- 1/includes/specialpage/SpecialPage.php
--- 2/includes/specialpage/SpecialPage.php
+++ b/includes/specialpage/SpecialPage.php
@@@ -61,12 -61,14 +61,14 @@@ class SpecialPage 
        protected $mContext;
  
        /**
 -       * @var LinkRenderer|null
 +       * @var \MediaWiki\Linker\LinkRenderer|null
         */
        private $linkRenderer;
  
        /**
         * Get a localised Title object for a specified special page name
+        * If you don't need a full Title object, consider using TitleValue through
+        * getTitleValueFor() below.
         *
         * @since 1.9
         * @since 1.21 $fragment parameter added
@@@ -78,9 -80,24 +80,24 @@@
         * @throws MWException
         */
        public static function getTitleFor( $name, $subpage = false, $fragment = '' ) {
+               return Title::newFromTitleValue(
+                       self::getTitleValueFor( $name, $subpage, $fragment )
+               );
+       }
+ 
+       /**
+        * Get a localised TitleValue object for a specified special page name
+        *
+        * @since 1.28
+        * @param string $name
+        * @param string|bool $subpage Subpage string, or false to not use a subpage
+        * @param string $fragment The link fragment (after the "#")
+        * @return TitleValue
+        */
+       public static function getTitleValueFor( $name, $subpage = false, $fragment = '' ) {
                $name = SpecialPageFactory::getLocalNameFor( $name, $subpage );
  
-               return Title::makeTitle( NS_SPECIAL, $name, $fragment );
+               return new TitleValue( NS_SPECIAL, $name, $fragment );
        }
  
        /**
@@@ -834,7 -851,7 +851,7 @@@
  
        /**
         * @since 1.28
 -       * @return LinkRenderer
 +       * @return \MediaWiki\Linker\LinkRenderer
         */
        protected function getLinkRenderer() {
                if ( $this->linkRenderer ) {
@@@ -846,7 -863,7 +863,7 @@@
  
        /**
         * @since 1.28
 -       * @param LinkRenderer $linkRenderer
 +       * @param \MediaWiki\Linker\LinkRenderer $linkRenderer
         */
        public function setLinkRenderer( LinkRenderer $linkRenderer ) {
                $this->linkRenderer = $linkRenderer;

diff --combined includes/specialpage/SpecialPageFactory.php
index 030a903,68c817c..4356bc5
--- 1/includes/specialpage/SpecialPageFactory.php
--- 2/includes/specialpage/SpecialPageFactory.php
+++ b/includes/specialpage/SpecialPageFactory.php
@@@ -84,8 -84,8 +84,8 @@@ class SpecialPageFactory 
  
                // Authentication
                'Userlogin' => 'SpecialUserLogin',
 -              'Userlogout' => 'SpecialUserlogoutPreAuthManager',
 -              'CreateAccount' => 'SpecialCreateAccountPreAuthManager',
 +              'Userlogout' => 'SpecialUserLogout',
 +              'CreateAccount' => 'SpecialCreateAccount',
                'LinkAccounts' => 'SpecialLinkAccounts',
                'UnlinkAccounts' => 'SpecialUnlinkAccounts',
                'ChangeCredentials' => 'SpecialChangeCredentials',
@@@ -96,9 -96,9 +96,9 @@@
                'Block' => 'SpecialBlock',
                'Unblock' => 'SpecialUnblock',
                'BlockList' => 'SpecialBlockList',
 -              'ChangePassword' => 'SpecialChangePasswordPreAuthManager',
 +              'ChangePassword' => 'SpecialChangePassword',
                'BotPasswords' => 'SpecialBotPasswords',
 -              'PasswordReset' => 'SpecialPasswordResetPreAuthManager',
 +              'PasswordReset' => 'SpecialPasswordReset',
                'DeletedContributions' => 'DeletedContributionsPage',
                'Preferences' => 'SpecialPreferences',
                'ResetTokens' => 'SpecialResetTokens',
@@@ -231,6 -231,7 +231,6 @@@
                global $wgDisableInternalSearch, $wgEmailAuthentication;
                global $wgEnableEmail, $wgEnableJavaScriptTest;
                global $wgPageLanguageUseDB, $wgContentHandlerUseDB;
 -              global $wgDisableAuthManager;
  
                if ( !is_array( self::$list ) ) {
  
@@@ -246,7 -247,7 +246,7 @@@
                        }
  
                        if ( $wgEnableEmail ) {
 -                              self::$list['ChangeEmail'] = 'SpecialChangeEmailPreAuthManager';
 +                              self::$list['ChangeEmail'] = 'SpecialChangeEmail';
                        }
  
                        if ( $wgEnableJavaScriptTest ) {
@@@ -260,6 -261,20 +260,6 @@@
                                self::$list['ChangeContentModel'] = 'SpecialChangeContentModel';
                        }
  
 -                      // horrible hack to allow selection between old and new classes via a feature flag - T110756
 -                      // will be removed once AuthManager is stable
 -                      if ( !$wgDisableAuthManager ) {
 -                              self::$list = array_map( function ( $class ) {
 -                                      return preg_replace( '/PreAuthManager$/', '', $class );
 -                              }, self::$list );
 -                              self::$list['Userlogout'] = 'SpecialUserLogout'; // case matters
 -                      } else {
 -                              self::$list['Userlogin'] = 'LoginForm';
 -                              self::$list = array_diff_key( self::$list, array_fill_keys( [
 -                                      'LinkAccounts', 'UnlinkAccounts', 'ChangeCredentials', 'RemoveCredentials',
 -                              ], true ) );
 -                      }
 -
                        // Add extension special pages
                        self::$list = array_merge( self::$list, $wgSpecialPages );
  
@@@ -699,6 -714,8 +699,8 @@@
                }
  
                if ( $subpage !== false && !is_null( $subpage ) ) {
+                       // Make sure it's in dbkey form
+                       $subpage = str_replace( ' ', '_', $subpage );
                        $name = "$name/$subpage";
                }