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
/
preferences
/
DefaultPreferencesFactory.php
diff --git
a/includes/preferences/DefaultPreferencesFactory.php
b/includes/preferences/DefaultPreferencesFactory.php
index
68236e5
..
6cee732
100644
(file)
--- a/
includes/preferences/DefaultPreferencesFactory.php
+++ b/
includes/preferences/DefaultPreferencesFactory.php
@@
-81,12
+81,10
@@
class DefaultPreferencesFactory implements PreferencesFactory {
protected $permissionManager;
/**
protected $permissionManager;
/**
- * TODO Make this a const when we drop HHVM support (T192166)
- *
* @var array
* @since 1.34
*/
* @var array
* @since 1.34
*/
- public
static $constructorOptions
= [
+ public
const CONSTRUCTOR_OPTIONS
= [
'AllowRequiringEmailForResets',
'AllowUserCss',
'AllowUserCssPrefs',
'AllowRequiringEmailForResets',
'AllowUserCss',
'AllowUserCssPrefs',
@@
-132,7
+130,7
@@
class DefaultPreferencesFactory implements PreferencesFactory {
NamespaceInfo $nsInfo,
PermissionManager $permissionManager
) {
NamespaceInfo $nsInfo,
PermissionManager $permissionManager
) {
- $options->assertRequiredOptions( self::
$constructorOptions
);
+ $options->assertRequiredOptions( self::
CONSTRUCTOR_OPTIONS
);
$this->options = $options;
$this->contLang = $contLang;
$this->options = $options;
$this->contLang = $contLang;