Update to MediaWiki 1.25.1

1 files changed, 11 insertions, 114 deletions

diff --git a/extensions/ParserFunctions/ParserFunctions.php b/extensions/ParserFunctions/ParserFunctions.php
index 963dbc4d..c38db82e 100644
--- a/extensions/ParserFunctions/ParserFunctions.php
+++ b/extensions/ParserFunctions/ParserFunctions.php
@@ -1,118 +1,15 @@
 <?php
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-	die( 'This file is a MediaWiki extension, it is not a valid entry point' );
-}
-
-/**
- * CONFIGURATION
- * These variables may be overridden in LocalSettings.php after you include the
- * extension file.
- */
-
-/**
- * Defines the maximum length of a string that string functions are allowed to operate on
- * Prevention against denial of service by string function abuses.
- */
-$wgPFStringLengthLimit = 1000;
-
-/**
- * Enable string functions.
- *
- * Set this to true if you want your users to be able to implement their own
- * parsers in the ugliest, most inefficient programming language known to man:
- * MediaWiki wikitext with ParserFunctions.
- *
- * WARNING: enabling this may have an adverse impact on the sanity of your users.
- * An alternative, saner solution for embedding complex text processing in
- * MediaWiki templates can be found at: http://www.mediawiki.org/wiki/Extension:Scribunto
- */
-$wgPFEnableStringFunctions = false;
-
-/**
-  * Enable string functions, when running Wikimedia Jenkins unit tests.
-  *
-  * Running Jenkins unit tests without setting $wgPFEnableStringFunctions = true;
-  * will cause all the parser tests for string functions to be skipped.
-  */
-if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI === true ) {
-	$wgPFEnableStringFunctions = true;
-}
-
-/** REGISTRATION */
-$wgExtensionCredits['parserhook'][] = array(
-	'path' => __FILE__,
-	'name' => 'ParserFunctions',
-	'version' => '1.6.0',
-	'url' => 'https://www.mediawiki.org/wiki/Extension:ParserFunctions',
-	'author' => array( 'Tim Starling', 'Robert Rohde', 'Ross McClure', 'Juraj Simlovic' ),
-	'descriptionmsg' => 'pfunc_desc',
-);
-
-$wgAutoloadClasses['ExtParserFunctions'] = __DIR__ . '/ParserFunctions_body.php';
-$wgAutoloadClasses['ExprParser'] = __DIR__ . '/Expr.php';
-$wgAutoloadClasses['ExprError'] = __DIR__ . '/Expr.php';
-$wgAutoloadClasses['Scribunto_LuaParserFunctionsLibrary'] = __DIR__ . '/ParserFunctions.library.php';
-
-$wgMessagesDirs['ParserFunctions'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['ParserFunctions'] = __DIR__ . '/ParserFunctions.i18n.php';
-$wgExtensionMessagesFiles['ParserFunctionsMagic'] = __DIR__ . '/ParserFunctions.i18n.magic.php';
-
-$wgParserTestFiles[] = __DIR__ . "/funcsParserTests.txt";
-$wgParserTestFiles[] = __DIR__ . "/stringFunctionTests.txt";
-
-$wgHooks['ParserFirstCallInit'][] = 'wfRegisterParserFunctions';
-
-/**
- * @param $parser Parser
- * @return bool
- */
-function wfRegisterParserFunctions( $parser ) {
-	global $wgPFEnableStringFunctions;
-
-	// These functions accept DOM-style arguments
-	$parser->setFunctionHook( 'if', 'ExtParserFunctions::ifObj', SFH_OBJECT_ARGS );
-	$parser->setFunctionHook( 'ifeq', 'ExtParserFunctions::ifeqObj', SFH_OBJECT_ARGS );
-	$parser->setFunctionHook( 'switch', 'ExtParserFunctions::switchObj', SFH_OBJECT_ARGS );
-	$parser->setFunctionHook( 'ifexist', 'ExtParserFunctions::ifexistObj', SFH_OBJECT_ARGS );
-	$parser->setFunctionHook( 'ifexpr', 'ExtParserFunctions::ifexprObj', SFH_OBJECT_ARGS );
-	$parser->setFunctionHook( 'iferror', 'ExtParserFunctions::iferrorObj', SFH_OBJECT_ARGS );
-	$parser->setFunctionHook( 'time', 'ExtParserFunctions::timeObj', SFH_OBJECT_ARGS );
-	$parser->setFunctionHook( 'timel', 'ExtParserFunctions::localTimeObj', SFH_OBJECT_ARGS );
-
-	$parser->setFunctionHook( 'expr', 'ExtParserFunctions::expr' );
-	$parser->setFunctionHook( 'rel2abs', 'ExtParserFunctions::rel2abs' );
-	$parser->setFunctionHook( 'titleparts', 'ExtParserFunctions::titleparts' );
-
-	// String Functions
-	if ( $wgPFEnableStringFunctions ) {
-		$parser->setFunctionHook( 'len',       'ExtParserFunctions::runLen'       );
-		$parser->setFunctionHook( 'pos',       'ExtParserFunctions::runPos'       );
-		$parser->setFunctionHook( 'rpos',      'ExtParserFunctions::runRPos'      );
-		$parser->setFunctionHook( 'sub',       'ExtParserFunctions::runSub'       );
-		$parser->setFunctionHook( 'count',     'ExtParserFunctions::runCount'     );
-		$parser->setFunctionHook( 'replace',   'ExtParserFunctions::runReplace'   );
-		$parser->setFunctionHook( 'explode',   'ExtParserFunctions::runExplode'   );
-		$parser->setFunctionHook( 'urldecode', 'ExtParserFunctions::runUrlDecode' );
-	}
-
+if ( function_exists( 'wfLoadExtension' ) ) {
+	wfLoadExtension( 'ParserFunctions' );
+	// Keep i18n globals so mergeMessageFileList.php doesn't break
+	$wgMessagesDirs['ParserFunctions'] = __DIR__ . '/i18n';
+	$wgExtensionMessagesFiles['ParserFunctionsMagic'] = __DIR__ . '/ParserFunctions.i18n.magic.php';
+	/* wfWarn(
+		'Deprecated PHP entry point used for ParserFunctions extension. Please use wfLoadExtension instead, ' .
+		'see https://www.mediawiki.org/wiki/Extension_registration for more details.'
+	); */
 	return true;
+} else {
+	die( 'This version of the ParserFunctions extension requires MediaWiki 1.25+' );
 }
-
-$wgHooks['UnitTestsList'][] = 'wfParserFunctionsTests';
-
-/**
- * @param $files array
- * @return bool
- */
-function wfParserFunctionsTests( &$files ) {
-	$files[] = __DIR__ . '/tests/ExpressionTest.php';
-	return true;
-}
-
-$wgHooks['ScribuntoExternalLibraries'][] = function( $engine, array &$extraLibraries ) {
-	if( $engine == 'lua' ) {
-		$extraLibraries['mw.ext.ParserFunctions'] = 'Scribunto_LuaParserFunctionsLibrary';
-	}
-	return true;
-};