From a1789ddde42033f1b05cc4929491214ee6e79383 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 17 Dec 2015 09:15:42 +0100
Subject: Update to MediaWiki 1.26.0

---
 tests/phpunit/includes/parser/MagicVariableTest.php   |  2 ++
 tests/phpunit/includes/parser/MediaWikiParserTest.php |  2 +-
 tests/phpunit/includes/parser/NewParserTest.php       | 10 ++++++----
 tests/phpunit/includes/parser/ParserMethodsTest.php   |  4 ++++
 tests/phpunit/includes/parser/TagHooksTest.php        |  7 +------
 tests/phpunit/includes/parser/TidyTest.php            |  3 +--
 6 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'tests/phpunit/includes/parser')

diff --git a/tests/phpunit/includes/parser/MagicVariableTest.php b/tests/phpunit/includes/parser/MagicVariableTest.php
index 17226113..cd54a9e3 100644
--- a/tests/phpunit/includes/parser/MagicVariableTest.php
+++ b/tests/phpunit/includes/parser/MagicVariableTest.php
@@ -10,6 +10,8 @@
  * @copyright Copyright © 2011, Antoine Musso
  * @file
  * @todo covers tags
+ *
+ * @group Database
  */
 
 class MagicVariableTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/includes/parser/MediaWikiParserTest.php b/tests/phpunit/includes/parser/MediaWikiParserTest.php
index df891f5a..96ae3bec 100644
--- a/tests/phpunit/includes/parser/MediaWikiParserTest.php
+++ b/tests/phpunit/includes/parser/MediaWikiParserTest.php
@@ -91,7 +91,7 @@ class MediaWikiParserTest {
 			// enough to cause there to be separate names for different
 			// things, which is good enough for our purposes.
 			$extensionName = basename( dirname( $fileName ) );
-			$testsName = $extensionName . '⁄' . basename( $fileName, '.txt' );
+			$testsName = $extensionName . '__' . basename( $fileName, '.txt' );
 			$escapedFileName = strtr( $fileName, array( "'" => "\\'", '\\' => '\\\\' ) );
 			$parserTestClassName = ucfirst( $testsName );
 			// Official spec for class names: http://php.net/manual/en/language.oop5.basic.php
diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
index 91aad10c..df7da98c 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -91,7 +91,7 @@ class NewParserTest extends MediaWikiTestCase {
 		);
 		$tmpGlobals['wgForeignFileRepos'] = array();
 		$tmpGlobals['wgDefaultExternalStore'] = array();
-		$tmpGlobals['wgEnableParserCache'] = false;
+		$tmpGlobals['wgParserCacheType'] = CACHE_NONE;
 		$tmpGlobals['wgCapitalLinks'] = true;
 		$tmpGlobals['wgNoFollowLinks'] = true;
 		$tmpGlobals['wgNoFollowDomainExceptions'] = array();
@@ -106,7 +106,6 @@ class NewParserTest extends MediaWikiTestCase {
 		$tmpGlobals['wgAdaptiveMessageCache'] = true;
 		$tmpGlobals['wgUseDatabaseMessages'] = true;
 		$tmpGlobals['wgLocaltimezone'] = 'UTC';
-		$tmpGlobals['wgDeferredUpdateList'] = array();
 		$tmpGlobals['wgGroupPermissions'] = array(
 			'*' => array(
 				'createaccount' => true,
@@ -160,10 +159,10 @@ class NewParserTest extends MediaWikiTestCase {
 		$this->djVuSupport = new DjVuSupport();
 		// Tidy support
 		$this->tidySupport = new TidySupport();
+		$tmpGlobals['wgTidyConfig'] = null;
 		$tmpGlobals['wgUseTidy'] = false;
-		$tmpGlobals['wgAlwaysUseTidy'] = false;
 		$tmpGlobals['wgDebugTidy'] = false;
-		$tmpGlobals['wgTidyConf'] = $IP . '/includes/tidy.conf';
+		$tmpGlobals['wgTidyConf'] = $IP . '/includes/tidy/tidy.conf';
 		$tmpGlobals['wgTidyOpts'] = '';
 		$tmpGlobals['wgTidyInternal'] = $this->tidySupport->isInternal();
 
@@ -185,6 +184,8 @@ class NewParserTest extends MediaWikiTestCase {
 		$wgNamespaceAliases['Image'] = $this->savedWeirdGlobals['image_alias'];
 		$wgNamespaceAliases['Image_talk'] = $this->savedWeirdGlobals['image_talk_alias'];
 
+		MWTidy::destroySingleton();
+
 		// Restore backends
 		RepoGroup::destroySingleton();
 		FileBackendGroup::destroySingleton();
@@ -454,6 +455,7 @@ class NewParserTest extends MediaWikiTestCase {
 			$GLOBALS[$var] = $val;
 		}
 
+		MWTidy::destroySingleton();
 		MagicWord::clearCache();
 
 		# The entries saved into RepoGroup cache with previous globals will be wrong.
diff --git a/tests/phpunit/includes/parser/ParserMethodsTest.php b/tests/phpunit/includes/parser/ParserMethodsTest.php
index 1790086a..af143caa 100644
--- a/tests/phpunit/includes/parser/ParserMethodsTest.php
+++ b/tests/phpunit/includes/parser/ParserMethodsTest.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @group Database
+ */
+
 class ParserMethodsTest extends MediaWikiLangTestCase {
 
 	public static function providePreSaveTransform() {
diff --git a/tests/phpunit/includes/parser/TagHooksTest.php b/tests/phpunit/includes/parser/TagHooksTest.php
index 251da471..4af38985 100644
--- a/tests/phpunit/includes/parser/TagHooksTest.php
+++ b/tests/phpunit/includes/parser/TagHooksTest.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @group Database
  * @group Parser
  */
 class TagHookTest extends MediaWikiTestCase {
@@ -18,12 +19,6 @@ class TagHookTest extends MediaWikiTestCase {
 		return array( array( "foo<bar" ), array( "foo>bar" ), array( "foo\nbar" ), array( "foo\rbar" ) );
 	}
 
-	protected function setUp() {
-		parent::setUp();
-
-		$this->setMwGlobals( 'wgAlwaysUseTidy', false );
-	}
-
 	/**
 	 * @dataProvider provideValidNames
 	 * @covers Parser::setHook
diff --git a/tests/phpunit/includes/parser/TidyTest.php b/tests/phpunit/includes/parser/TidyTest.php
index f656a74d..5db29080 100644
--- a/tests/phpunit/includes/parser/TidyTest.php
+++ b/tests/phpunit/includes/parser/TidyTest.php
@@ -7,8 +7,7 @@ class TidyTest extends MediaWikiTestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		$check = MWTidy::tidy( '' );
-		if ( strpos( $check, '<!--' ) !== false ) {
+		if ( !MWTidy::isEnabled() ) {
 			$this->markTestSkipped( 'Tidy not found' );
 		}
 	}
-- 
cgit v1.2.3-54-g00ecf