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
Database: Fix degenerate parenthesized joins
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
PreferencesTest.php
diff --git
a/tests/phpunit/includes/PreferencesTest.php
b/tests/phpunit/includes/PreferencesTest.php
index
ada516d
..
4a15225
100644
(file)
--- a/
tests/phpunit/includes/PreferencesTest.php
+++ b/
tests/phpunit/includes/PreferencesTest.php
@@
-131,10
+131,9
@@
class PreferencesTest extends MediaWikiTestCase {
->method( 'getConfig' )
->willReturn( $configMock );
->method( 'getConfig' )
->willReturn( $configMock );
- $this->setTemporaryHook( 'PreferencesFormPreSave', function(
+ $this->setTemporaryHook( 'PreferencesFormPreSave', function
(
$formData, $form, $user, &$result, $oldUserOptions )
use ( $newOptions, $oldOptions, $userMock ) {
$formData, $form, $user, &$result, $oldUserOptions )
use ( $newOptions, $oldOptions, $userMock ) {
-
$this->assertSame( $userMock, $user );
foreach ( $newOptions as $option => $value ) {
$this->assertSame( $value, $formData[ $option ] );
$this->assertSame( $userMock, $user );
foreach ( $newOptions as $option => $value ) {
$this->assertSame( $value, $formData[ $option ] );
@@
-151,13
+150,9
@@
class PreferencesTest extends MediaWikiTestCase {
/** Helper */
protected function prefsFor( $user_key ) {
/** Helper */
protected function prefsFor( $user_key ) {
- $preferences = [];
- Preferences::profilePreferences(
+ return Preferences::getPreferences(
$this->prefUsers[$user_key],
$this->prefUsers[$user_key],
- $this->context,
- $preferences
+ $this->context
);
);
-
- return $preferences;
}
}
}
}