Merge "Make SpecialPageFactory a service"

diff --combined RELEASE-NOTES-1.32
index 5522332,44f4558..8305d71
--- 1/RELEASE-NOTES-1.32
--- 2/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@@ -208,9 -208,6 +208,9 @@@ because of Phabricator reports
  * (T140807) The wgResourceLoaderLESSImportPaths configuration option was removed
    from ResourceLoader. Instead, use `@import` statements in LESS to import
    files directly from nearby directories within the same project.
 +* (T140804) The wgResourceLoaderLESSVars configuration option, deprecated
 +  since 1.30, was removed. Instead, to expose variables from PHP to LESS, use
 +  the ResourceLoaderModule::getLessVars() method.
  * The protected methods PHPSessionHandler::returnSuccess() and returnFailure(),
    only needed for PHP5 compatibility, have been removed. It now uses the boolean
    values `true` and `false` respectively.
@@@ -249,6 -246,8 +249,8 @@@
    resetServiceForTesting( 'MagicWordFactory' ) on a MediaWikiServices.
  * mw.util.init() has been removed. This function is not needed anymore and was
    a no-op function since 1.30.
+ * SpecialPageFactory::resetList() is a no-op.  Call overrideMwServices()
+   instead.
  
  === Deprecations in 1.32 ===
  * Use of a StartProfiler.php file is deprecated in favour of placing
@@@ -354,6 -353,9 +356,9 @@@
  * wfGetMainCache() is deprecated, use ObjectCache::getLocalClusterInstance()
    instead.
  * wfGetCache() is deprecated, use ObjectCache::getInstance() instead.
+ * All SpecialPageFactory static methods are deprecated. Instead, call the
+   methods on a SpecialPageFactory instance, which may be obtained from
+   MediaWikiServices.
  
  === Other changes in 1.32 ===
  * (T198811) The following tables have had their UNIQUE indexes turned into

diff --combined includes/ServiceWiring.php
index 344c31d,c6bbb60..e710575
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -48,6 -48,7 +48,7 @@@ use MediaWiki\MediaWikiServices
  use MediaWiki\Preferences\PreferencesFactory;
  use MediaWiki\Preferences\DefaultPreferencesFactory;
  use MediaWiki\Shell\CommandFactory;
+ use MediaWiki\Special\SpecialPageFactory;
  use MediaWiki\Storage\BlobStore;
  use MediaWiki\Storage\BlobStoreFactory;
  use MediaWiki\Storage\NameTableStore;
@@@ -545,6 -546,13 +546,13 @@@ return 
                );
        },
  
+       'SpecialPageFactory' => function ( MediaWikiServices $services ) : SpecialPageFactory {
+               return new SpecialPageFactory(
+                       $services->getMainConfig(),
+                       $services->getContentLanguage()
+               );
+       },
+ 
        'StatsdDataFactory' => function ( MediaWikiServices $services ) : IBufferingStatsdDataFactory {
                return new BufferingStatsdDataFactory(
                        rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ), '.' )
@@@ -621,8 -629,7 +629,8 @@@
                return new MediaWikiTitleCodec(
                        $services->getContentLanguage(),
                        $services->getGenderCache(),
 -                      $services->getMainConfig()->get( 'LocalInterwikis' )
 +                      $services->getMainConfig()->get( 'LocalInterwikis' ),
 +                      $services->getInterwikiLookup()
                );
        },
  

diff --combined tests/phpunit/MediaWikiTestCase.php
index 2f7a6c8,89bcf60..6972165
--- 1/tests/phpunit/MediaWikiTestCase.php
--- 2/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@@ -947,7 -947,9 +947,9 @@@ abstract class MediaWikiTestCase extend
         * @return MediaWikiServices
         * @throws MWException
         */
-       protected function overrideMwServices( Config $configOverrides = null, array $services = [] ) {
+       protected static function overrideMwServices(
+               Config $configOverrides = null, array $services = []
+       ) {
                if ( !$configOverrides ) {
                        $configOverrides = new HashConfig();
                }
@@@ -1246,7 -1248,7 +1248,7 @@@
                                $user
                        );
                        // an edit always attempt to purge backlink links such as history
 -                      // pages. That is unneccessary.
 +                      // pages. That is unnecessary.
                        JobQueueGroup::singleton()->get( 'htmlCacheUpdate' )->delete();
                        // WikiPages::doEditUpdates randomly adds RC purges
                        JobQueueGroup::singleton()->get( 'recentChangesUpdate' )->delete();
@@@ -1784,7 -1786,7 +1786,7 @@@
                                        }
                                        $db->insert(
                                                'interwiki',
 -                                              array_map( 'get_object_vars', iterator_to_array( $this->interwikiTable ) ),
 +                                              array_values( array_map( 'get_object_vars', iterator_to_array( $this->interwikiTable ) ) ),
                                                __METHOD__
                                        );
                                }