Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/242925
Change subject: Remove unused minor and major in WikiReference ...................................................................... Remove unused minor and major in WikiReference Given that the class is not constructed anywhere outside of core the constructor can be altered without having to worry about b/c. Change-Id: Ie49c43a1724f05cb95a296dc0fad0f1c587d80ef --- M includes/WikiMap.php M tests/phpunit/includes/WikiMapTest.php M tests/phpunit/includes/WikiReferenceTest.php 3 files changed, 9 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/25/242925/1 diff --git a/includes/WikiMap.php b/includes/WikiMap.php index 7eaebdf..6215af1 100644 --- a/includes/WikiMap.php +++ b/includes/WikiMap.php @@ -51,7 +51,7 @@ $path = $wgConf->get( 'wgArticlePath', $wikiID, $major, array( 'lang' => $minor, 'site' => $major ) ); - return new WikiReference( $major, $minor, $canonicalServer, $path, $server ); + return new WikiReference( $canonicalServer, $path, $server ); } /** @@ -127,22 +127,16 @@ * Reference to a locally-hosted wiki */ class WikiReference { - private $mMinor; ///< 'en', 'meta', 'mediawiki', etc - private $mMajor; ///< 'wiki', 'wiktionary', etc private $mCanonicalServer; ///< canonical server URL, e.g. 'https://www.mediawiki.org' private $mServer; ///< server URL, may be protocol-relative, e.g. '//www.mediawiki.org' private $mPath; ///< path, '/wiki/$1' /** - * @param string $major - * @param string $minor * @param string $canonicalServer * @param string $path * @param null|string $server */ - public function __construct( $major, $minor, $canonicalServer, $path, $server = null ) { - $this->mMajor = $major; - $this->mMinor = $minor; + public function __construct( $canonicalServer, $path, $server = null ) { $this->mCanonicalServer = $canonicalServer; $this->mPath = $path; $this->mServer = $server === null ? $canonicalServer : $server; diff --git a/tests/phpunit/includes/WikiMapTest.php b/tests/phpunit/includes/WikiMapTest.php index 3219d1d..2092e0c 100644 --- a/tests/phpunit/includes/WikiMapTest.php +++ b/tests/phpunit/includes/WikiMapTest.php @@ -27,8 +27,8 @@ } public function provideGetWiki() { - $enwiki = new WikiReference( 'wiki', 'en', 'http://en.example.org', '/w/$1' ); - $ruwiki = new WikiReference( 'wiki', 'ru', '//ru.example.org', '/wiki/$1' ); + $enwiki = new WikiReference( 'http://en.example.org', '/w/$1' ); + $ruwiki = new WikiReference( '//ru.example.org', '/wiki/$1' ); return array( 'unknown' => array( false, 'xyzzy' ), diff --git a/tests/phpunit/includes/WikiReferenceTest.php b/tests/phpunit/includes/WikiReferenceTest.php index b72bae7..1d907eb 100644 --- a/tests/phpunit/includes/WikiReferenceTest.php +++ b/tests/phpunit/includes/WikiReferenceTest.php @@ -20,12 +20,12 @@ * @dataProvider provideGetDisplayName */ public function testGetDisplayName( $expected, $canonicalServer ) { - $reference = new WikiReference( 'wiki', 'xx', $canonicalServer, '/wiki/$1' ); + $reference = new WikiReference( $canonicalServer, '/wiki/$1' ); $this->assertEquals( $expected, $reference->getDisplayName() ); } public function testGetCanonicalServer() { - $reference = new WikiReference( 'wiki', 'xx', 'https://acme.com', '/wiki/$1', '//acme.com' ); + $reference = new WikiReference( 'https://acme.com', '/wiki/$1', '//acme.com' ); $this->assertEquals( 'https://acme.com', $reference->getCanonicalServer() ); } @@ -44,7 +44,7 @@ * @dataProvider provideGetCanonicalUrl */ public function testGetCanonicalUrl( $expected, $canonicalServer, $server, $path, $page, $fragmentId ) { - $reference = new WikiReference( 'wiki', 'xx', $canonicalServer, $path, $server ); + $reference = new WikiReference( $canonicalServer, $path, $server ); $this->assertEquals( $expected, $reference->getCanonicalUrl( $page, $fragmentId ) ); } @@ -53,7 +53,7 @@ * @note getUrl is an alias for getCanonicalUrl */ public function testGetUrl( $expected, $canonicalServer, $server, $path, $page, $fragmentId ) { - $reference = new WikiReference( 'wiki', 'xx', $canonicalServer, $path, $server ); + $reference = new WikiReference( $canonicalServer, $path, $server ); $this->assertEquals( $expected, $reference->getUrl( $page, $fragmentId ) ); } @@ -72,7 +72,7 @@ * @dataProvider provideGetFullUrl */ public function testGetFullUrl( $expected, $canonicalServer, $server, $path, $page, $fragmentId ) { - $reference = new WikiReference( 'wiki', 'xx', $canonicalServer, $path, $server ); + $reference = new WikiReference( $canonicalServer, $path, $server ); $this->assertEquals( $expected, $reference->getFullUrl( $page, $fragmentId ) ); } -- To view, visit https://gerrit.wikimedia.org/r/242925 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie49c43a1724f05cb95a296dc0fad0f1c587d80ef Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Hoo man <h...@online.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits