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

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

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 83847d8..dcb4aaf 100644 (file)
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -107,7 +107,7 @@ return [
                        $services->getDBLoadBalancerFactory(),
                        $services->getExternalStoreAccess(),
                        $services->getMainWANObjectCache(),
-                       new ServiceOptions( BlobStoreFactory::$constructorOptions,
+                       new ServiceOptions( BlobStoreFactory::CONSTRUCTOR_OPTIONS,
                                $services->getMainConfig() ),
                        $services->getContentLanguage()
                );
@@ -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' )
@@ -521,6 +521,17 @@ return [
                );
        },
 
+       'PasswordReset' => function ( MediaWikiServices $services ) : PasswordReset {
+               $options = new ServiceOptions( PasswordReset::CONSTRUCTOR_OPTIONS, $services->getMainConfig() );
+               return new PasswordReset(
+                       $options,
+                       AuthManager::singleton(),
+                       $services->getPermissionManager(),
+                       $services->getDBLoadBalancer(),
+                       LoggerFactory::getInstance( 'authentication' )
+               );
+       },
+
        'PerDbNameStatsdDataFactory' =>
        function ( MediaWikiServices $services ) : StatsdDataFactoryInterface {
                $config = $services->getMainConfig();
@@ -534,7 +545,7 @@ return [
        'PermissionManager' => function ( MediaWikiServices $services ) : PermissionManager {
                return new PermissionManager(
                        new ServiceOptions(
-                               PermissionManager::$constructorOptions, $services->getMainConfig()
+                               PermissionManager::CONSTRUCTOR_OPTIONS, $services->getMainConfig()
                        ),
                        $services->getSpecialPageFactory(),
                        $services->getRevisionLookup(),
@@ -545,7 +556,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(),