Merge "Services: Convert BlockManager's static to a const now HHVM is gone" into...

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 4692d05..860edfd 100644 (file)
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -116,7 +116,7 @@ return [
        'BlockManager' => function ( MediaWikiServices $services ) : BlockManager {
                return new BlockManager(
                        new ServiceOptions(
-                               BlockManager::$constructorOptions, $services->getMainConfig()
+                               BlockManager::CONSTRUCTOR_OPTIONS, $services->getMainConfig()
                        ),
                        $services->getPermissionManager(),
                        LoggerFactory::getInstance( 'BlockManager' )

diff --git a/includes/block/BlockManager.php b/includes/block/BlockManager.php
index 077bdca..be09665 100644 (file)
--- a/includes/block/BlockManager.php
+++ b/includes/block/BlockManager.php
@@ -49,12 +49,10 @@ class BlockManager {
        private $options;
 
        /**
-        * TODO Make this a const when HHVM support is dropped (T192166)
-        *
         * @var array
         * @since 1.34
         */
-       public static $constructorOptions = [
+       public const CONSTRUCTOR_OPTIONS = [
                'ApplyIpBlocksToXff',
                'CookieSetOnAutoblock',
                'CookieSetOnIpBlock',
@@ -79,7 +77,7 @@ class BlockManager {
                PermissionManager $permissionManager,
                LoggerInterface $logger
        ) {
-               $options->assertRequiredOptions( self::$constructorOptions );
+               $options->assertRequiredOptions( self::CONSTRUCTOR_OPTIONS );
                $this->options = $options;
                $this->permissionManager = $permissionManager;
                $this->logger = $logger;

diff --git a/tests/phpunit/includes/block/BlockManagerTest.php b/tests/phpunit/includes/block/BlockManagerTest.php
index 230d36a..ca08f67 100644 (file)
--- a/tests/phpunit/includes/block/BlockManagerTest.php
+++ b/tests/phpunit/includes/block/BlockManagerTest.php
@@ -53,7 +53,7 @@ class BlockManagerTest extends MediaWikiTestCase {
                return [
                        new LoggedServiceOptions(
                                self::$serviceOptionsAccessLog,
-                               BlockManager::$constructorOptions,
+                               BlockManager::CONSTRUCTOR_OPTIONS,
                                MediaWikiServices::getInstance()->getMainConfig()
                        ),
                        MediaWikiServices::getInstance()->getPermissionManager(),