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

[lhc/web/wiklou.git] / includes / ServiceWiring.php

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 003b640..f6d0ec0 100644 (file)
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -298,7 +298,7 @@ return [
 
                return new $conf['class'](
                        new ServiceOptions(
-                               LocalisationCache::$constructorOptions,
+                               LocalisationCache::CONSTRUCTOR_OPTIONS,
                                // Two of the options are stored in $wgLocalisationCacheConf
                                $conf,
                                // In case someone set that config variable and didn't reset all keys, set defaults.
@@ -586,7 +586,7 @@ return [
        'PreferencesFactory' => function ( MediaWikiServices $services ) : PreferencesFactory {
                $factory = new DefaultPreferencesFactory(
                        new ServiceOptions(
-                               DefaultPreferencesFactory::$constructorOptions, $services->getMainConfig() ),
+                               DefaultPreferencesFactory::CONSTRUCTOR_OPTIONS, $services->getMainConfig() ),
                        $services->getContentLanguage(),
                        AuthManager::singleton(),
                        $services->getLinkRendererFactory()->create(),