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

Replace deprecated User::newFromId on Special:Redirect

Browse source 
Change-Id: I3a4f995e4cfb4dfe68b50662aebf795e3bb78b4a
This commit is contained in:
Umherirrender 2021-03-19 20:22:37 +01:00
parent ef0e5d4825
commit 237ef2a624
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/specialpage/SpecialPageFactory.php
View file

@ -915,7 +915,8 @@ class SpecialPageFactory {
'Redirect' => [
'class' => \SpecialRedirect::class,
'services' => [
'RepoGroup'
'RepoGroup',
'UserFactory',
]
],
'Revisiondelete' => [

14
includes/specials/SpecialRedirect.php
View file

@ -21,6 +21,8 @@
* @ingroup SpecialPage
*/
use MediaWiki\User\UserFactory;
/**
* A special page that redirects to: the user for a numeric user id,
* the file for a given filename, or the page for a given revision id.
@ -51,15 +53,23 @@ class SpecialRedirect extends FormSpecialPage {
/** @var RepoGroup */
private $repoGroup;
/** @var UserFactory */
private $userFactory;
/**
* @param RepoGroup $repoGroup
* @param UserFactory $userFactory
*/
public function __construct( RepoGroup $repoGroup ) {
public function __construct(
RepoGroup $repoGroup,
UserFactory $userFactory
) {
parent::__construct( 'Redirect' );
$this->mType = null;
$this->mValue = null;
$this->repoGroup = $repoGroup;
$this->userFactory = $userFactory;
}
/**
@ -83,7 +93,7 @@ class SpecialRedirect extends FormSpecialPage {
// Message: redirect-not-numeric
return Status::newFatal( $this->getMessagePrefix() . '-not-numeric' );
}
$user = User::newFromId( (int)$this->mValue );
$user = $this->userFactory->newFromId( (int)$this->mValue );
$user->load(); // Make sure the id is validated by loading the user
if ( $user->isAnon() ) {
// Message: redirect-not-exists

8
tests/phpunit/includes/specials/SpecialRedirectTest.php
View file

@ -1,7 +1,5 @@
<?php
use MediaWiki\MediaWikiServices;
/**
* Test class for SpecialRedirect class
*
@ -25,13 +23,15 @@ class SpecialRedirectTest extends MediaWikiIntegrationTestCase {
* @covers SpecialRedirect::dispatchLog()
*/
public function testDispatch( $method, $type, $value, $expectedStatus ) {
$userFactory = $this->getServiceContainer()->getUserFactory();
$page = new SpecialRedirect(
MediaWikiServices::getInstance()->getRepoGroup()
$this->getServiceContainer()->getRepoGroup(),
$userFactory
);
// setup the user object
if ( $value === self::CREATE_USER ) {
$user = User::newFromName( __CLASS__ );
$user = $userFactory->newFromName( __CLASS__ );
$user->addToDatabase();
$value = $user->getId();
}