From: daniel <daniel.kinzler@wikimedia.de>
Date: Fri, 11 Sep 2015 17:34:54 +0000 (+0200)
Subject: Remove WikiReference::getHostname.
X-Git-Tag: 1.31.0-rc.0~10030
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=50ff1eaec339ef6e0b1fc676041420b2b44c2eb5;p=lhc%2Fweb%2Fwiklou.git

Remove WikiReference::getHostname.

getHostname() was broken and seems to be unused.

Change-Id: I8d44a6907ad395ea12deebf404831c06e07ed401
---

diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index a01f1b66bd..027ff72f9f 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -148,20 +148,6 @@ class WikiReference {
 		$this->mServer = $server === null ? $canonicalServer : $server;
 	}
 
-	/**
-	 * @return string
-	 * @throws MWException
-	 */
-	public function getHostname() {
-		$prefixes = array( 'http://', 'https://' );
-		foreach ( $prefixes as $prefix ) {
-			if ( substr( $this->mCanonicalServer, 0, strlen( $prefix ) ) ) {
-				return substr( $this->mCanonicalServer, strlen( $prefix ) );
-			}
-		}
-		throw new MWException( "Invalid hostname for wiki {$this->mMinor}.{$this->mMajor}" );
-	}
-
 	/**
 	 * Get the URL in a way to be displayed to the user
 	 * More or less Wikimedia specific
@@ -169,13 +155,12 @@ class WikiReference {
 	 * @return string
 	 */
 	public function getDisplayName() {
-		$url = $this->getUrl( '' );
-		$parsed = wfParseUrl( $url );
+		$parsed = wfParseUrl( $this->mCanonicalServer );
 		if ( $parsed ) {
 			return $parsed['host'];
 		} else {
-			// Invalid URL. There's no sane thing to do here, so just return it
-			return $url;
+			// Invalid server spec. There's no sane thing to do here, so just return the canonical server name in full
+			return $this->mCanonicalServer;
 		}
 	}
 
diff --git a/tests/phpunit/includes/WikiReferenceTest.php b/tests/phpunit/includes/WikiReferenceTest.php
index ce9fc66b12..4fe2e855b6 100644
--- a/tests/phpunit/includes/WikiReferenceTest.php
+++ b/tests/phpunit/includes/WikiReferenceTest.php
@@ -6,30 +6,13 @@
 
 class WikiReferenceTest extends PHPUnit_Framework_TestCase {
 
-	public function provideGetHostname() {
-		return array(
-			'http' => array( 'foo.bar', 'http://foo.bar' ),
-			'https' => array( 'foo.bar', 'https://foo.bar' ),
-		);
-	}
-
-	/**
-	 * @dataProvider provideGetHostname
-	 */
-	public function testGetHostname( $expected, $canonicalServer ) {
-		$this->markTestSkipped( 'The implementation is patently broken.' );
-
-		$reference = new WikiReference( 'wiki', 'xx', $canonicalServer, '/wiki/$1' );
-		$this->assertEquals( $expected, $reference->getHostname() );
-	}
-
 	public function provideGetDisplayName() {
 		return array(
 			'http' => array( 'foo.bar', 'http://foo.bar' ),
 			'https' => array( 'foo.bar', 'http://foo.bar' ),
 
 			// apparently, this is the expected behavior
-			'invalid' => array( 'purple kittens/wiki/', 'purple kittens' ),
+			'invalid' => array( 'purple kittens', 'purple kittens' ),
 		);
 	}
 
@@ -67,6 +50,7 @@ class WikiReferenceTest extends PHPUnit_Framework_TestCase {
 
 	/**
 	 * @dataProvider provideGetCanonicalUrl
+	 * @note getUrl is an alias for getCanonicalUrl
 	 */
 	public function testGetUrl( $expected, $canonicalServer, $server, $path, $page, $fragmentId ) {
 		$reference = new WikiReference( 'wiki', 'xx', $canonicalServer, $path, $server );