Merge "Rename BlockRestriction -> BlockRestrictionStore and wire it up as a service"

diff --combined includes/MediaWikiServices.php
index c13d33f,7a5f026..3590633
--- 1/includes/MediaWikiServices.php
--- 2/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@@ -6,13 -6,14 +6,14 @@@ use CommentStore
  use Config;
  use ConfigFactory;
  use CryptHKDF;
 -use CryptRand;
 +use DateFormatterFactory;
  use EventRelayerGroup;
  use GenderCache;
  use GlobalVarConfig;
  use Hooks;
  use IBufferingStatsdDataFactory;
  use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
+ use MediaWiki\Block\BlockRestrictionStore;
  use MediaWiki\Http\HttpRequestFactory;
  use MediaWiki\Permissions\PermissionManager;
  use MediaWiki\Preferences\PreferencesFactory;
@@@ -63,7 -64,6 +64,7 @@@ use Wikimedia\Services\ServiceContainer
  use Wikimedia\Services\NoSuchServiceException;
  use MediaWiki\Interwiki\InterwikiLookup;
  use MagicWordFactory;
 +use MediaWiki\Storage\PageEditStash;
  
  /**
   * Service locator for MediaWiki core services.
@@@ -436,6 -436,14 +437,14 @@@ class MediaWikiServices extends Service
                return $this->getService( 'BlobStoreFactory' );
        }
  
+       /**
+        * @since 1.33
+        * @return BlockRestrictionStore
+        */
+       public function getBlockRestrictionStore() : BlockRestrictionStore {
+               return $this->getService( 'BlockRestrictionStore' );
+       }
+ 
        /**
         * Returns the Config object containing the bootstrap configuration.
         * Bootstrap configuration would typically include database credentials
@@@ -518,11 -526,13 +527,11 @@@
        }
  
        /**
 -       * @since 1.28
 -       * @deprecated since 1.32, use random_bytes()/random_int()
 -       * @return CryptRand
 +       * @since 1.33
 +       * @return DateFormatterFactory
         */
 -      public function getCryptRand() {
 -              wfDeprecated( __METHOD__, '1.32' );
 -              return $this->getService( 'CryptRand' );
 +      public function getDateFormatterFactory() {
 +              return $this->getService( 'DateFormatterFactory' );
        }
  
        /**
@@@ -668,7 -678,7 +677,7 @@@
        }
  
        /**
 -       * @since 1.33
 +       * @since 1.34
         * @return NamespaceInfo
         */
        public function getNamespaceInfo() : NamespaceInfo {
@@@ -691,14 -701,6 +700,14 @@@
                return $this->getService( 'OldRevisionImporter' );
        }
  
 +      /**
 +       * @return PageEditStash
 +       * @since 1.34
 +       */
 +      public function getPageEditStash() {
 +              return $this->getService( 'PageEditStash' );
 +      }
 +
        /**
         * @since 1.29
         * @return Parser

diff --combined includes/ServiceWiring.php
index 40e9f87,b11e129..832cee8
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -39,6 -39,7 +39,7 @@@
  
  use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
  use MediaWiki\Auth\AuthManager;
+ use MediaWiki\Block\BlockRestrictionStore;
  use MediaWiki\Config\ConfigRepository;
  use MediaWiki\Interwiki\ClassicInterwikiLookup;
  use MediaWiki\Interwiki\InterwikiLookup;
@@@ -62,7 -63,6 +63,7 @@@ use MediaWiki\Storage\BlobStore
  use MediaWiki\Storage\BlobStoreFactory;
  use MediaWiki\Storage\NameTableStoreFactory;
  use MediaWiki\Storage\SqlBlobStore;
 +use MediaWiki\Storage\PageEditStash;
  
  return [
        'ActorMigration' => function ( MediaWikiServices $services ) : ActorMigration {
@@@ -84,6 -84,12 +85,12 @@@
                );
        },
  
+       'BlockRestrictionStore' => function ( MediaWikiServices $services ) : BlockRestrictionStore {
+               return new BlockRestrictionStore(
+                       $services->getDBLoadBalancer()
+               );
+       },
+ 
        'CommentStore' => function ( MediaWikiServices $services ) : CommentStore {
                return new CommentStore(
                        $services->getContentLanguage(),
@@@ -135,8 -141,8 +142,8 @@@
                return new CryptHKDF( $secret, $config->get( 'HKDFAlgorithm' ), $cache, $context );
        },
  
 -      'CryptRand' => function () : CryptRand {
 -              return new CryptRand();
 +      'DateFormatterFactory' => function () : DateFormatterFactory {
 +              return new DateFormatterFactory;
        },
  
        'DBLoadBalancer' => function ( MediaWikiServices $services ) : Wikimedia\Rdbms\LoadBalancer {
@@@ -351,20 -357,6 +358,20 @@@
                );
        },
  
 +      'PageEditStash' => function ( MediaWikiServices $services ) : PageEditStash {
 +              $config = $services->getMainConfig();
 +
 +              return new PageEditStash(
 +                      ObjectCache::getLocalClusterInstance(),
 +                      $services->getDBLoadBalancer(),
 +                      LoggerFactory::getInstance( 'StashEdit' ),
 +                      $services->getStatsdDataFactory(),
 +                      defined( 'MEDIAWIKI_JOB_RUNNER' ) || $config->get( 'CommandLineMode' )
 +                              ? PageEditStash::INITIATOR_JOB_OR_CLI
 +                              : PageEditStash::INITIATOR_USER
 +              );
 +      },
 +
        'Parser' => function ( MediaWikiServices $services ) : Parser {
                return $services->getParserFactory()->create();
        },
@@@ -388,8 -380,7 +395,8 @@@
                        wfUrlProtocols(),
                        $services->getSpecialPageFactory(),
                        $services->getMainConfig(),
 -                      $services->getLinkRendererFactory()
 +                      $services->getLinkRendererFactory(),
 +                      $services->getNamespaceInfo()
                );
        },
  
@@@ -418,9 -409,7 +425,9 @@@
                        $config->get( 'WhitelistRead' ),
                        $config->get( 'WhitelistReadRegexp' ),
                        $config->get( 'EmailConfirmToEdit' ),
 -                      $config->get( 'BlockDisablesLogin' ) );
 +                      $config->get( 'BlockDisablesLogin' ),
 +                      $services->getNamespaceInfo()
 +              );
        },
  
        'PreferencesFactory' => function ( MediaWikiServices $services ) : PreferencesFactory {
@@@ -458,17 -447,8 +465,17 @@@
                        $config,
                        LoggerFactory::getInstance( 'resourceloader' )
                );
 +
                $rl->addSource( $config->get( 'ResourceLoaderSources' ) );
 +
 +              // Core modules, then extension/skin modules
                $rl->register( include "$IP/resources/Resources.php" );
 +              $rl->register( $config->get( 'ResourceModules' ) );
 +              Hooks::run( 'ResourceLoaderRegisterModules', [ &$rl ] );
 +
 +              if ( $config->get( 'EnableJavaScriptTest' ) === true ) {
 +                      $rl->registerTestModules();
 +              }
  
                return $rl;
        },
@@@ -689,8 -669,7 +696,8 @@@
                        $services->getContentLanguage(),
                        $services->getGenderCache(),
                        $services->getMainConfig()->get( 'LocalInterwikis' ),
 -                      $services->getInterwikiLookup()
 +                      $services->getInterwikiLookup(),
 +                      $services->getNamespaceInfo()
                );
        },
  

diff --combined includes/specials/SpecialBlock.php
index 7d86663,0ff517e..6156766
--- 1/includes/specials/SpecialBlock.php
--- 2/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@@ -21,9 -21,9 +21,9 @@@
   * @ingroup SpecialPage
   */
  
- use MediaWiki\Block\BlockRestriction;
  use MediaWiki\Block\Restriction\PageRestriction;
  use MediaWiki\Block\Restriction\NamespaceRestriction;
+ use MediaWiki\MediaWikiServices;
  
  /**
   * A special page that allows users with 'block' right to block users from
@@@ -141,9 -141,7 +141,9 @@@ class SpecialBlock extends FormSpecialP
         * @return array
         */
        protected function getFormFields() {
 -              global $wgBlockAllowsUTEdit;
 +              $conf = $this->getConfig();
 +              $enablePartialBlocks = $conf->get( 'EnablePartialBlocks' );
 +              $blockAllowsUTEdit = $conf->get( 'BlockAllowsUTEdit' );
  
                $this->getOutput()->enableOOUI();
  
@@@ -151,6 -149,9 +151,6 @@@
  
                $suggestedDurations = self::getSuggestedDurations();
  
 -              $conf = $this->getConfig();
 -              $enablePartialBlocks = $conf->get( 'EnablePartialBlocks' );
 -
                $a = [];
  
                $a['Target'] = [
@@@ -231,7 -232,7 +231,7 @@@
                        ];
                }
  
 -              if ( $wgBlockAllowsUTEdit ) {
 +              if ( $blockAllowsUTEdit ) {
                        $a['DisableUTEdit'] = [
                                'type' => 'check',
                                'label-message' => 'ipb-disableusertalk',
@@@ -949,8 -950,9 +949,9 @@@
                                        $currentBlock->isSitewide( $block->isSitewide() );
  
                                        // Set the block id of the restrictions.
+                                       $blockRestrictionStore = MediaWikiServices::getInstance()->getBlockRestrictionStore();
                                        $currentBlock->setRestrictions(
-                                               BlockRestriction::setBlockId( $currentBlock->getId(), $restrictions )
+                                               $blockRestrictionStore->setBlockId( $currentBlock->getId(), $restrictions )
                                        );
                                }
  
@@@ -1075,7 -1077,7 +1076,7 @@@
         *
         * @todo strtotime() only accepts English strings. This means the expiry input
         *       can only be specified in English.
 -       * @see https://secure.php.net/manual/en/function.strtotime.php
 +       * @see https://www.php.net/manual/en/function.strtotime.php
         *
         * @param string $expiry Whatever was typed into the form
         * @return string|bool Timestamp or 'infinity' or false on error.