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

diff --combined includes/ServiceWiring.php
index 6c0748c,152c417..dcb4aaf
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -522,7 -522,7 +522,7 @@@ return 
        },
  
        'PasswordReset' => function ( MediaWikiServices $services ) : PasswordReset {
 -              $options = new ServiceOptions( PasswordReset::$constructorOptions, $services->getMainConfig() );
 +              $options = new ServiceOptions( PasswordReset::CONSTRUCTOR_OPTIONS, $services->getMainConfig() );
                return new PasswordReset(
                        $options,
                        AuthManager::singleton(),
@@@ -556,7 -556,7 +556,7 @@@
        '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(),