wikimedia/mediawiki-skins-MinervaNeue
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue synced 2024-09-23 18:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

ServiceWiring: Avoid usage of deprecated Title::getSubjectPage()

Browse source 
SkinUserPageHelper::__construct() should be able to consume a LinkTarget
too as NamespaceInfo::getSubjectPage() method returns a LinkTarget and
the Title::getSubjectPage() is deprecated.

Change-Id: I08bfc9bb21772b450798b6354bee2ab09d5dba4d
This commit is contained in:
Derick A 2020-08-08 13:19:48 +01:00
parent 146cb2bb3b
commit ae8e3ad58b
3 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/ServiceWiring.php
View file

@ -84,10 +84,11 @@ return [
$user = $context->getUser();
$userPageHelper = $services->getService( 'Minerva.SkinUserPageHelper' );
$languagesHelper = $services->getService( 'Minerva.LanguagesHelper' );
$namespaceInfo = $services->getNamespaceInfo();
$relevantUserPageHelper = $title->inNamespace( NS_USER_TALK ) ?
new SkinUserPageHelper(
$context->getSkin()->getRelevantTitle()->getSubjectPage()
$namespaceInfo->getSubjectPage( $context->getSkin()->getRelevantTitle() )
) :
$userPageHelper;

5
includes/Skins/SkinUserPageHelper.php
View file

@ -20,6 +20,7 @@
namespace MediaWiki\Minerva\Skins;
use MediaWiki\Linker\LinkTarget;
use Title;
use User;
@ -39,9 +40,9 @@ class SkinUserPageHelper {
private $pageUser;
/**
* @param Title|null $title
* @param Title|LinkTarget|null $title
*/
public function __construct( Title $title = null ) {
public function __construct( $title = null ) {
$this->title = $title;
}

15
tests/phpunit/skins/SkinUserPageHelperTest.php
View file

@ -2,6 +2,7 @@
namespace Tests\MediaWiki\Minerva;
use MediaWiki\Linker\LinkTarget;
use MediaWiki\Minerva\Skins\SkinUserPageHelper;
use MediaWikiTestCase;
use Title;
@ -24,6 +25,20 @@ class SkinUserPageHelperTest extends MediaWikiTestCase {
$this->assertFalse( $helper->isUserPage() );
}
/**
* @covers ::isUserPage
* @covers ::getPageUser
*/
public function testLinkTargetAsConsumer() {
$linkTarget = $this->createMock( LinkTarget::class );
$linkTarget->method( 'getText' )
->willReturn( 'User:LinkTarget' );
$helper = new SkinUserPageHelper( $linkTarget );
$this->assertNull( $helper->getPageUser() );
$this->assertFalse( $helper->isUserPage() );
}
/**
* @covers ::isUserPage
* @covers ::fetchData