$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 );
}
/**
* 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;
}
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' ),
* @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() );
}
* @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 ) );
}
* @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 ) );
}
* @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 ) );
}