Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Hard deprecate UserSaveOptions hook"

Browse source
This commit is contained in:
jenkins-bot 2021-08-11 19:29:12 +00:00 committed by Gerrit Code Review
commit 4a77ea0cf0
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/HookContainer/DeprecatedHooks.php
View file

@ -55,7 +55,7 @@ class DeprecatedHooks {
'UserLoadFromDatabase' => [ 'deprecatedVersion' => '1.37' ],
'UserLoadOptions' => [ 'deprecatedVersion' => '1.37', 'silent' => true ],
'UserResetAllOptions' => [ 'deprecatedVersion' => '1.37' ],
'UserSaveOptions' => [ 'deprecatedVersion' => '1.37', 'silent' => true ],
'UserSaveOptions' => [ 'deprecatedVersion' => '1.37' ],
'UserSetCookies' => [ 'deprecatedVersion' => '1.27' ],
'WikiPageDeletionUpdates' => [ 'deprecatedVersion' => '1.32', 'silent' => true ],
];

4
tests/phpunit/includes/user/UserOptionsManagerTest.php
View file

@ -149,6 +149,7 @@ class UserOptionsManagerTest extends UserOptionsLookupTest {
* @covers MediaWiki\User\UserOptionsManager::saveOptions
*/
public function testUserSaveOptionsHookAbort() {
$this->filterDeprecated( '/UserSaveOptions/' );
$user = $this->getTestUser()->getUser();
$this->setTemporaryHook(
'UserSaveOptions',
@ -183,6 +184,7 @@ class UserOptionsManagerTest extends UserOptionsLookupTest {
* @covers MediaWiki\User\UserOptionsManager::saveOptions
*/
public function testUserSaveOptionsHookModify() {
$this->filterDeprecated( '/UserSaveOptions/' );
$user = $this->getTestUser()->getUser();
$this->setTemporaryHook(
'UserSaveOptions',
@ -233,6 +235,7 @@ class UserOptionsManagerTest extends UserOptionsLookupTest {
* @covers MediaWiki\User\UserOptionsManager::saveOptions
*/
public function testUserSaveOptionsHookOriginal() {
$this->filterDeprecated( '/UserSaveOptions/' );
$user = $this->getTestUser()->getUser();
$manager = $this->getManager();
$originalLanguage = $manager->getOption( $user, 'language' );
@ -284,6 +287,7 @@ class UserOptionsManagerTest extends UserOptionsLookupTest {
* @covers \MediaWiki\User\UserOptionsManager::loadUserOptions
*/
public function testLoadOptionsHookReflectsInOriginalOptions() {
$this->filterDeprecated( '/UserSaveOptions/' );
$user = $this->getTestUser()->getUser();
$manager = $this->getManager();
$this->setTemporaryHook(