From 725a203bc1f35a5cd7624d4f1a116fb46667ca2d Mon Sep 17 00:00:00 2001
From: Marius Hoch <hoo@online.de>
Date: Thu, 1 Oct 2015 19:12:07 +0200
Subject: [PATCH] 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
---
 includes/WikiMap.php                         | 10 ++--------
 tests/phpunit/includes/WikiMapTest.php       |  4 ++--
 tests/phpunit/includes/WikiReferenceTest.php | 10 +++++-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index 7eaebdfcc4..6215af16a9 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -51,7 +51,7 @@ class WikiMap {
 
 		$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 @@ class WikiMap {
  * 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 3219d1dffb..2092e0cf5d 100644
--- a/tests/phpunit/includes/WikiMapTest.php
+++ b/tests/phpunit/includes/WikiMapTest.php
@@ -27,8 +27,8 @@ class WikiMapTest extends MediaWikiLangTestCase {
 	}
 
 	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 b72bae7325..1d907ebfe3 100644
--- a/tests/phpunit/includes/WikiReferenceTest.php
+++ b/tests/phpunit/includes/WikiReferenceTest.php
@@ -20,12 +20,12 @@ class WikiReferenceTest extends PHPUnit_Framework_TestCase {
 	 * @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 @@ class WikiReferenceTest extends PHPUnit_Framework_TestCase {
 	 * @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 @@ class WikiReferenceTest extends PHPUnit_Framework_TestCase {
 	 * @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 @@ class WikiReferenceTest extends PHPUnit_Framework_TestCase {
 	 * @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 ) );
 	}
 
-- 
2.20.1