dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
6d3fe6c
..
dcb4aaf
100644
(file)
--- a/
includes/ServiceWiring.php
+++ b/
includes/ServiceWiring.php
@@
-522,7
+522,7
@@
return [
},
'PasswordReset' => function ( MediaWikiServices $services ) : PasswordReset {
},
'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(),
return new PasswordReset(
$options,
AuthManager::singleton(),
@@
-556,7
+556,7
@@
return [
'PreferencesFactory' => function ( MediaWikiServices $services ) : PreferencesFactory {
$factory = new DefaultPreferencesFactory(
new ServiceOptions(
'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(),
$services->getContentLanguage(),
AuthManager::singleton(),
$services->getLinkRendererFactory()->create(),