From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 tests/phpunit/includes/title/MediaWikiTitleCodecTest.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'tests/phpunit/includes/title/MediaWikiTitleCodecTest.php')

diff --git a/tests/phpunit/includes/title/MediaWikiTitleCodecTest.php b/tests/phpunit/includes/title/MediaWikiTitleCodecTest.php
index f95b3050..78d304c1 100644
--- a/tests/phpunit/includes/title/MediaWikiTitleCodecTest.php
+++ b/tests/phpunit/includes/title/MediaWikiTitleCodecTest.php
@@ -16,7 +16,6 @@
  * http://www.gnu.org/copyleft/gpl.html
  *
  * @file
- * @license GPL 2+
  * @author Daniel Kinzler
  */
 
@@ -39,6 +38,7 @@ class MediaWikiTitleCodecTest extends MediaWikiTestCase {
 			'wgLang' => Language::factory( 'en' ),
 			'wgAllowUserJs' => false,
 			'wgDefaultLanguageVariant' => false,
+			'wgMetaNamespace' => 'Project',
 			'wgLocalInterwikis' => array( 'localtestiw' ),
 			'wgCapitalLinks' => true,
 
@@ -82,6 +82,8 @@ class MediaWikiTitleCodecTest extends MediaWikiTestCase {
 	protected function makeCodec( $lang ) {
 		$gender = $this->getGenderCache();
 		$lang = Language::factory( $lang );
+		// language object can came from cache, which does not respect test settings
+		$lang->resetNamespaces();
 		return new MediaWikiTitleCodec( $lang, $gender );
 	}
 
@@ -367,13 +369,6 @@ class MediaWikiTitleCodecTest extends MediaWikiTestCase {
 
 	/**
 	 * @dataProvider provideGetNamespaceName
-	 *
-	 * @param int $namespace
-	 * @param string $text
-	 * @param string $lang
-	 * @param string $expected
-	 *
-	 * @internal param \TitleValue $title
 	 */
 	public function testGetNamespaceName( $namespace, $text, $lang, $expected ) {
 		$codec = $this->makeCodec( $lang );
-- 
cgit v1.2.3-54-g00ecf