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

Removed deprecated WikiMap::getWikiIdFromDomain() method

Browse source 
Also simplify WikiMap::isCurrentWikiDbDomain() slightly

Change-Id: I21358c5e5ae1d229228fc416894f50b4ee444182
This commit is contained in:
Aaron Schulz 2019-07-03 09:51:23 -07:00 committed by Timo Tijhof
parent 76f5c309ad
commit 55301a4bb6
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES-1.34
View file

@ -272,6 +272,8 @@ because of Phabricator reports.
0..(numRows-1).
* The ChangePasswordForm hook, deprecated in 1.27, has been removed. Use the
AuthChangeFormFields hook or security levels instead.
* WikiMap::getWikiIdFromDomain(), deprecated in 1.33, has been removed.
Use WikiMap::getWikiIdFromDbDomain() instead.
* …
=== Deprecations in 1.34 ===

11
includes/WikiMap.php
View file

@ -286,15 +286,6 @@ class WikiMap {
: (string)$domain->getDatabase();
}
/**
* @param string $domain
* @return string
* @deprecated Since 1.33; use getWikiIdFromDbDomain()
*/
public static function getWikiIdFromDomain( $domain ) {
return self::getWikiIdFromDbDomain( $domain );
}
/**
* @return DatabaseDomain Database domain of the current wiki
* @since 1.33
@ -311,7 +302,7 @@ class WikiMap {
* @since 1.33
*/
public static function isCurrentWikiDbDomain( $domain ) {
return self::getCurrentWikiDbDomain()->equals( DatabaseDomain::newFromId( $domain ) );
return self::getCurrentWikiDbDomain()->equals( $domain );
}
/**

6
tests/phpunit/includes/WikiMapTest.php
View file

@ -236,7 +236,7 @@ class WikiMapTest extends MediaWikiLangTestCase {
$this->assertEquals( $wiki, WikiMap::getWikiFromUrl( $url ) );
}
public function provideGetWikiIdFromDomain() {
public function provideGetWikiIdFromDbDomain() {
return [
[ 'db-prefix_', 'db-prefix_' ],
[ wfWikiID(), wfWikiID() ],
@ -249,10 +249,10 @@ class WikiMapTest extends MediaWikiLangTestCase {
}
/**
* @dataProvider provideGetWikiIdFromDomain
* @dataProvider provideGetWikiIdFromDbDomain
* @covers WikiMap::getWikiIdFromDbDomain()
*/
public function testGetWikiIdFromDomain( $domain, $wikiId ) {
public function testGetWikiIdFromDbDomain( $domain, $wikiId ) {
$this->assertEquals( $wikiId, WikiMap::getWikiIdFromDbDomain( $domain ) );
}