2012-01-28 16:22:18 +00:00
|
|
|
<?php
|
|
|
|
/**
|
|
|
|
* Wikitext scripting infrastructure for MediaWiki: hooks.
|
|
|
|
* Copyright (C) 2009-2012 Victor Vasiliev <vasilvv@gmail.com>
|
|
|
|
* http://www.mediawiki.org/
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
2012-04-06 05:04:30 +00:00
|
|
|
* Hooks for the Scribunto extension.
|
2012-01-28 16:22:18 +00:00
|
|
|
*/
|
2012-04-06 05:04:30 +00:00
|
|
|
class ScribuntoHooks {
|
2013-03-20 16:30:26 +00:00
|
|
|
/**
|
|
|
|
* Get software information for Special:Version
|
|
|
|
* @param &$software array
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
public static function getSoftwareInfo( &$software ) {
|
|
|
|
$engine = Scribunto::newDefaultEngine();
|
|
|
|
$engine->setTitle( Title::makeTitle( NS_SPECIAL, 'Version' ) );
|
|
|
|
$engine->getSoftwareInfo( $software );
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-01-28 16:22:18 +00:00
|
|
|
/**
|
|
|
|
* Register parser hooks.
|
|
|
|
* @param $parser Parser
|
2012-06-15 23:34:35 +00:00
|
|
|
* @return bool
|
2012-01-28 16:22:18 +00:00
|
|
|
*/
|
|
|
|
public static function setupParserHook( &$parser ) {
|
2012-05-22 03:56:07 +00:00
|
|
|
$parser->setFunctionHook( 'invoke', 'ScribuntoHooks::invokeHook', SFH_OBJECT_ARGS );
|
2012-01-28 16:22:18 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2012-04-04 06:10:32 +00:00
|
|
|
* Called when the interpreter is to be reset.
|
2014-07-07 18:46:59 +00:00
|
|
|
*
|
2012-06-15 23:34:35 +00:00
|
|
|
* @param $parser Parser
|
2012-01-28 16:22:18 +00:00
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
public static function clearState( &$parser ) {
|
2012-04-06 05:04:30 +00:00
|
|
|
Scribunto::resetParserEngine( $parser );
|
2012-01-28 16:22:18 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-11-15 00:13:19 +00:00
|
|
|
/**
|
|
|
|
* Called when the parser is cloned
|
|
|
|
*
|
|
|
|
* @param $parser Parser
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
public static function parserCloned( $parser ) {
|
|
|
|
$parser->scribunto_engine = null;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-01-28 16:22:18 +00:00
|
|
|
/**
|
2012-04-04 06:10:32 +00:00
|
|
|
* Hook function for {{#invoke:module|func}}
|
2012-01-28 16:46:15 +00:00
|
|
|
*
|
|
|
|
* @param $parser Parser
|
|
|
|
* @param $frame PPFrame
|
|
|
|
* @param $args array
|
2012-06-15 23:34:35 +00:00
|
|
|
* @throws MWException
|
|
|
|
* @throws ScribuntoException
|
2012-01-28 16:22:18 +00:00
|
|
|
* @return string
|
|
|
|
*/
|
2012-05-22 03:56:07 +00:00
|
|
|
public static function invokeHook( &$parser, $frame, $args ) {
|
|
|
|
if ( !@constant( get_class( $frame ) . '::SUPPORTS_INDEX_OFFSET' ) ) {
|
2014-07-07 18:46:59 +00:00
|
|
|
throw new MWException(
|
2012-05-22 03:56:07 +00:00
|
|
|
'Scribunto needs MediaWiki 1.20 or later (Preprocessor::SUPPORTS_INDEX_OFFSET)' );
|
2012-01-28 16:22:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
wfProfileIn( __METHOD__ );
|
2012-05-22 03:56:07 +00:00
|
|
|
|
2012-01-28 16:22:18 +00:00
|
|
|
try {
|
2012-05-22 03:56:07 +00:00
|
|
|
if ( count( $args ) < 2 ) {
|
|
|
|
throw new ScribuntoException( 'scribunto-common-nofunction' );
|
|
|
|
}
|
|
|
|
$moduleName = trim( $frame->expand( $args[0] ) );
|
2012-04-06 05:04:30 +00:00
|
|
|
$engine = Scribunto::getParserEngine( $parser );
|
2012-04-05 07:58:02 +00:00
|
|
|
$title = Title::makeTitleSafe( NS_MODULE, $moduleName );
|
2013-03-08 17:01:50 +00:00
|
|
|
if ( !$title || Scribunto::isDocPage( $title ) ) {
|
2014-04-14 01:24:21 +00:00
|
|
|
throw new ScribuntoException( 'scribunto-common-nosuchmodule', array( 'args' => array( $moduleName ) ) );
|
2012-01-28 16:22:18 +00:00
|
|
|
}
|
2012-04-05 07:58:02 +00:00
|
|
|
$module = $engine->fetchModuleFromParser( $title );
|
Added more Lua environment features
Package library:
* Added a simulation of the Lua 5.1 package library.
* Removed mw.import(), replaced it with a package loader. Packages can be
retrieved from the wiki, using require('Module:Foo'), or from files
distributed with Scribunto, using require('foo'). The "Module:" prefix allows
for source compatibility with existing Lua code.
* Added a couple of libraries from LuaForge: luabit and stringtools.
* Made fetchModuleFromParser() return null on error instead of throwing an
exception, to more easily support the desired behaviour of the package loader,
which needs to return null on error.
* Renamed mw.setupEnvironment() to mw.setup() since it is setting up things
other than the environment now.
* In MWServer:handleRegisterLibrary(), remove the feature which interprets dots
in library names, since LuaSandbox doesn't support this.
Improved module isolation and related refactoring:
* Expose restricted versions of getfenv() and setfenv() to user Lua code.
Requires luasandbox r114952.
* Don't cache the export list returned by module execution for later function
calls. This breaks isolation of #invoke calls, since the local variables are
persistent.
* Removed ScribuntoFunctionBase and its children, since it doesn't really have
a purpose if it can't cache anything. Instead, invoke functions using a module
method called invoke().
* Removed Module::initialize(), replaced it with a validate() function. This is
a more elegant interface and works better with the new module caching scheme.
* Use a Status object for the return value of Engine::validate() instead of an
array. Use the formatting facilities of the Status class.
Other:
* Removed "too many returns" error, doesn't fit in with Lua conventions.
* Use the standalone engine by default, so that the extension will work without
configuration for more people.
* Added an accessor for $engine->interpreter
* Fix mw.clone() to correctly clone metatables
* If the standalone interpreter exits due to an error, there are some contexts
where the initial error will be caught and ignored, and the user will see the
error from checkValid() instead. In this case, rethrow the original error for
a more informative message.
* Load mw.lua into the initial standalone environment, to reduce code
duplication between mw.lua and MWServer.lua.
* Fixed a bug in Scribunto_LuaStandaloneInterpreter::handleCall() for functions
that return no results.
* Fixed a bug in encodeLuaVar() for strings with "\r". Added test case.
* In MWServer.lua, don't call error() for internal errors, instead just print
the error and exit. This avoids a protocol violation when an error is
encountered from within handleCall().
* Added lots of documentation. Lua doc comments are in LuaDoc format.
Change-Id: Ie2fd572c362bedf02f45d3fa5352a5280e034740
2012-04-18 03:46:18 +00:00
|
|
|
if ( !$module ) {
|
2014-04-14 01:24:21 +00:00
|
|
|
throw new ScribuntoException( 'scribunto-common-nosuchmodule', array( 'args' => array( $moduleName ) ) );
|
2012-04-05 07:58:02 +00:00
|
|
|
}
|
2012-05-22 03:56:07 +00:00
|
|
|
$functionName = trim( $frame->expand( $args[1] ) );
|
|
|
|
|
2014-09-06 19:32:28 +00:00
|
|
|
$bits = $args[1]->splitArg();
|
2012-05-22 03:56:07 +00:00
|
|
|
unset( $args[0] );
|
|
|
|
unset( $args[1] );
|
2014-09-06 19:32:28 +00:00
|
|
|
|
|
|
|
// If $bits['index'] is empty, then the function name was parsed as a
|
|
|
|
// key=value pair (because of an equals sign in it), and since it didn't
|
|
|
|
// have an index, we don't need the index offset.
|
|
|
|
$childFrame = $frame->newChild( $args, $title, $bits['index'] === '' ? 0 : 1 );
|
2012-05-22 03:56:07 +00:00
|
|
|
$result = $module->invoke( $functionName, $childFrame );
|
2012-07-09 03:10:13 +00:00
|
|
|
$result = UtfNormal::cleanUp( strval( $result ) );
|
2012-01-28 16:22:18 +00:00
|
|
|
|
|
|
|
wfProfileOut( __METHOD__ );
|
2012-07-09 03:10:13 +00:00
|
|
|
return $result;
|
2012-04-06 05:04:30 +00:00
|
|
|
} catch( ScribuntoException $e ) {
|
2012-04-23 11:36:13 +00:00
|
|
|
$trace = $e->getScriptTraceHtml( array( 'msgOptions' => array( 'content' ) ) );
|
|
|
|
$html = Html::element( 'p', array(), $e->getMessage() );
|
|
|
|
if ( $trace !== false ) {
|
2012-10-06 23:42:39 +00:00
|
|
|
$html .= Html::element( 'p',
|
|
|
|
array(),
|
|
|
|
wfMessage( 'scribunto-common-backtrace' )->inContentLanguage()->text()
|
|
|
|
) . $trace;
|
2014-06-30 17:38:46 +00:00
|
|
|
} else {
|
|
|
|
$html .= Html::element( 'p',
|
|
|
|
array(),
|
|
|
|
wfMessage( 'scribunto-common-no-details' )->inContentLanguage()->text()
|
|
|
|
);
|
2012-04-23 11:36:13 +00:00
|
|
|
}
|
|
|
|
$out = $parser->getOutput();
|
|
|
|
if ( !isset( $out->scribunto_errors ) ) {
|
|
|
|
$out->addOutputHook( 'ScribuntoError' );
|
|
|
|
$out->scribunto_errors = array();
|
2012-09-06 04:56:42 +00:00
|
|
|
$parser->addTrackingCategory( 'scribunto-common-error-category' );
|
2012-04-23 11:36:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
$out->scribunto_errors[] = $html;
|
|
|
|
$id = 'mw-scribunto-error-' . ( count( $out->scribunto_errors ) - 1 );
|
2014-06-30 17:38:46 +00:00
|
|
|
$parserError = htmlspecialchars( $e->getMessage() );
|
2012-01-28 16:22:18 +00:00
|
|
|
wfProfileOut( __METHOD__ );
|
2012-04-23 11:36:13 +00:00
|
|
|
|
|
|
|
// #iferror-compatible error element
|
2014-07-07 18:46:59 +00:00
|
|
|
return "<strong class=\"error\"><span class=\"scribunto-error\" id=\"$id\">" .
|
2012-04-23 11:36:13 +00:00
|
|
|
$parserError. "</span></strong>";
|
2012-01-28 16:22:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-06-15 23:34:35 +00:00
|
|
|
/**
|
|
|
|
* @param $title Title
|
|
|
|
* @param $lang string
|
|
|
|
* @return bool
|
|
|
|
*/
|
2012-04-05 07:58:02 +00:00
|
|
|
public static function getCodeLanguage( $title, &$lang ) {
|
2012-04-06 05:04:30 +00:00
|
|
|
global $wgScribuntoUseCodeEditor;
|
2013-02-20 22:00:42 +00:00
|
|
|
if( $wgScribuntoUseCodeEditor && $title->getNamespace() == NS_MODULE &&
|
2013-03-08 17:01:50 +00:00
|
|
|
!Scribunto::isDocPage( $title )
|
2013-02-20 22:00:42 +00:00
|
|
|
) {
|
2012-04-06 05:04:30 +00:00
|
|
|
$engine = Scribunto::newDefaultEngine();
|
2012-02-06 22:14:47 +00:00
|
|
|
if( $engine->getCodeEditorLanguage() ) {
|
|
|
|
$lang = $engine->getCodeEditorLanguage();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2014-07-07 18:46:59 +00:00
|
|
|
|
2012-02-06 22:14:47 +00:00
|
|
|
return true;
|
|
|
|
}
|
2012-01-28 16:22:18 +00:00
|
|
|
|
|
|
|
/**
|
2013-02-20 22:00:42 +00:00
|
|
|
* Set the Scribunto content handler for modules
|
2012-01-28 16:46:15 +00:00
|
|
|
* @param $title Title
|
2013-02-20 22:00:42 +00:00
|
|
|
* @param &$model string
|
2012-01-28 16:46:15 +00:00
|
|
|
* @return bool
|
2012-01-28 16:22:18 +00:00
|
|
|
*/
|
2013-02-20 22:00:42 +00:00
|
|
|
public static function contentHandlerDefaultModelFor( $title, &$model ) {
|
2013-03-08 17:01:50 +00:00
|
|
|
if( $title->getNamespace() == NS_MODULE && !Scribunto::isDocPage( $title ) ) {
|
2013-02-20 22:00:42 +00:00
|
|
|
$model = 'Scribunto';
|
2012-01-28 16:22:18 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Adds report of number of evaluations by the single wikitext page.
|
2013-03-14 12:42:42 +00:00
|
|
|
*
|
|
|
|
* @deprecated
|
2012-01-28 16:46:15 +00:00
|
|
|
* @param $parser Parser
|
|
|
|
* @param $report
|
2012-01-28 16:22:18 +00:00
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
public static function reportLimits( $parser, &$report ) {
|
2012-04-13 10:38:12 +00:00
|
|
|
if ( Scribunto::isParserEnginePresent( $parser ) ) {
|
|
|
|
$engine = Scribunto::getParserEngine( $parser );
|
|
|
|
$report .= $engine->getLimitReport();
|
|
|
|
}
|
2012-01-28 16:22:18 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-03-14 12:42:42 +00:00
|
|
|
/**
|
|
|
|
* Adds report of number of evaluations by the single wikitext page.
|
|
|
|
*
|
|
|
|
* @param $parser Parser
|
|
|
|
* @param $output ParserOutput
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
public static function reportLimitData( $parser, $output ) {
|
|
|
|
// Unhook the deprecated hook, since the new one exists.
|
|
|
|
global $wgHooks;
|
|
|
|
unset( $wgHooks['ParserLimitReport']['scribunto'] );
|
|
|
|
|
|
|
|
if ( Scribunto::isParserEnginePresent( $parser ) ) {
|
|
|
|
$engine = Scribunto::getParserEngine( $parser );
|
|
|
|
$engine->reportLimitData( $output );
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Formats the limit report data
|
|
|
|
*
|
|
|
|
* @param $key string
|
|
|
|
* @param &$value string
|
|
|
|
* @param &$report string
|
|
|
|
* @param $isHTML bool
|
|
|
|
* @param $localize bool
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
public static function formatLimitData( $key, &$value, &$report, $isHTML, $localize ) {
|
|
|
|
$engine = Scribunto::newDefaultEngine();
|
|
|
|
return $engine->formatLimitData( $key, $value, $report, $isHTML, $localize );
|
|
|
|
}
|
|
|
|
|
2012-01-28 16:22:18 +00:00
|
|
|
/**
|
|
|
|
* Adds the module namespaces.
|
|
|
|
*/
|
|
|
|
public static function addCanonicalNamespaces( &$list ) {
|
|
|
|
$list[NS_MODULE] = 'Module';
|
|
|
|
$list[NS_MODULE_TALK] = 'Module_talk';
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-07-07 18:46:59 +00:00
|
|
|
/**
|
2012-07-03 02:56:55 +00:00
|
|
|
* EditPageBeforeEditChecks hook
|
|
|
|
* @param $editor EditPage
|
|
|
|
* @param $checkboxes Checkbox array
|
|
|
|
* @param $tabindex Current tabindex
|
|
|
|
*/
|
|
|
|
public static function beforeEditChecks( &$editor, &$checkboxes, &$tabindex ) {
|
2012-07-14 04:23:42 +00:00
|
|
|
if ( $editor->getTitle()->getNamespace() !== NS_MODULE ) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-03-08 17:01:50 +00:00
|
|
|
if ( Scribunto::isDocPage( $editor->getTitle() ) ) {
|
2013-02-20 22:00:42 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-07-14 04:23:42 +00:00
|
|
|
global $wgOut;
|
|
|
|
$wgOut->addModules( 'ext.scribunto.edit' );
|
|
|
|
$editor->editFormTextAfterTools = '<div id="mw-scribunto-console"></div>';
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* EditPageBeforeEditButtons hook
|
|
|
|
* @param $editor EditPage
|
|
|
|
* @param $buttons Button array
|
|
|
|
* @param $tabindex Current tabindex
|
|
|
|
*/
|
|
|
|
public static function beforeEditButtons( &$editor, &$buttons, &$tabindex ) {
|
|
|
|
if ( $editor->getTitle()->getNamespace() !== NS_MODULE ) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-03-08 17:01:50 +00:00
|
|
|
if ( Scribunto::isDocPage( $editor->getTitle() ) ) {
|
2013-02-20 22:00:42 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-07-14 04:23:42 +00:00
|
|
|
unset( $buttons['preview'] );
|
2012-07-03 02:56:55 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-06-15 23:34:35 +00:00
|
|
|
/**
|
|
|
|
* @param $editor EditPage
|
|
|
|
* @param $text string
|
|
|
|
* @param $error
|
|
|
|
* @param $summary
|
|
|
|
* @return bool
|
|
|
|
*/
|
2012-05-23 04:32:25 +00:00
|
|
|
public static function validateScript( $editor, $text, &$error, $summary ) {
|
2012-06-15 23:34:35 +00:00
|
|
|
global $wgOut;
|
|
|
|
$title = $editor->getTitle();
|
2012-01-28 16:22:18 +00:00
|
|
|
|
2012-07-03 02:56:55 +00:00
|
|
|
if( $title->getNamespace() != NS_MODULE ) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-03-08 17:01:50 +00:00
|
|
|
if ( Scribunto::isDocPage( $title ) ) {
|
2013-02-20 22:00:42 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-07-03 02:56:55 +00:00
|
|
|
$engine = Scribunto::newDefaultEngine();
|
|
|
|
$engine->setTitle( $title );
|
|
|
|
$status = $engine->validate( $text, $title->getPrefixedDBkey() );
|
|
|
|
if( $status->isOK() ) {
|
|
|
|
return true;
|
|
|
|
}
|
2012-01-28 16:22:18 +00:00
|
|
|
|
2012-07-03 02:56:55 +00:00
|
|
|
$errmsg = $status->getWikiText( 'scribunto-error-short', 'scribunto-error-long' );
|
|
|
|
$error = <<<WIKI
|
2012-01-28 16:22:18 +00:00
|
|
|
<div class="errorbox">
|
|
|
|
{$errmsg}
|
|
|
|
</div>
|
|
|
|
<br clear="all" />
|
2012-04-23 11:36:13 +00:00
|
|
|
WIKI;
|
2012-07-03 02:56:55 +00:00
|
|
|
if ( isset( $status->scribunto_error->params['module'] ) ) {
|
|
|
|
$module = $status->scribunto_error->params['module'];
|
|
|
|
$line = $status->scribunto_error->params['line'];
|
|
|
|
if ( $module === $title->getPrefixedDBkey() && preg_match( '/^\d+$/', $line ) ) {
|
|
|
|
$wgOut->addInlineScript( 'window.location.hash = ' . Xml::encodeJsVar( "#mw-ce-l$line" ) );
|
2012-04-23 11:36:13 +00:00
|
|
|
}
|
2012-01-28 16:22:18 +00:00
|
|
|
}
|
2012-01-28 16:46:15 +00:00
|
|
|
|
2012-01-28 16:22:18 +00:00
|
|
|
return true;
|
|
|
|
}
|
Added tests and fixed bugs
* Added unit tests for the two Lua interpreter classes
* Fixed a bug in checkType()
* Have Scribunto_LuaSandboxInterpreter throw an exception on construct
when the extension doesn't exist, to match the standalone behaviour.
* In Scribunto_LuaSandboxInterpreter, removed debugging statements
accidentally left in.
* Convert LuaSandboxTimeoutError to the appropriate common error
message.
* Moved the option munging from the sandbox engine to the interpreter,
so that the interpreter can be unit tested separately.
* Use /bin/sh instead of bash for lua_ulimit.sh, since dash is smaller
and still supports ulimit.
* Use exec to run the lua binary, so that the vsize of the shell doesn't
add to the memory limit.
* Added a quit function to the standalone interpreter. Unused at present.
* Don't add a comma after the last element of a table in a Lua
expression.
* Make the SIGXCPU detection work: proc_open() runs the command via a
shell, which reports signals in the child via the exit status, so
proc_get_status() will never return a valid termsig element.
* In MWServer:call(), fixed a bug causing the return values to be
wrapped in an array.
* Fixed a misunderstanding of what select() does.
* In MWServer:getStatus(), fixed indexes so that vsize will be correct.
Removed RSS, since it wasn't used anyway and turns out to be measured
in multiples of the page size, and I couldn't be bothered trying to
fetch that from getconf. Return the PID and vsize as numbers rather
than strings.
* Added a simple table dump feature to MWServer:debug().
* Fixed brackets in MWServer:tostring().
* Added missing Linux 32-bit binary.
Change-Id: Ibf5f4656b1c0a9f81287d363184c3fe9d2abdafd
2012-04-16 04:41:08 +00:00
|
|
|
|
2012-06-15 23:34:35 +00:00
|
|
|
/**
|
|
|
|
* @param $files array
|
|
|
|
* @return bool
|
|
|
|
*/
|
Added tests and fixed bugs
* Added unit tests for the two Lua interpreter classes
* Fixed a bug in checkType()
* Have Scribunto_LuaSandboxInterpreter throw an exception on construct
when the extension doesn't exist, to match the standalone behaviour.
* In Scribunto_LuaSandboxInterpreter, removed debugging statements
accidentally left in.
* Convert LuaSandboxTimeoutError to the appropriate common error
message.
* Moved the option munging from the sandbox engine to the interpreter,
so that the interpreter can be unit tested separately.
* Use /bin/sh instead of bash for lua_ulimit.sh, since dash is smaller
and still supports ulimit.
* Use exec to run the lua binary, so that the vsize of the shell doesn't
add to the memory limit.
* Added a quit function to the standalone interpreter. Unused at present.
* Don't add a comma after the last element of a table in a Lua
expression.
* Make the SIGXCPU detection work: proc_open() runs the command via a
shell, which reports signals in the child via the exit status, so
proc_get_status() will never return a valid termsig element.
* In MWServer:call(), fixed a bug causing the return values to be
wrapped in an array.
* Fixed a misunderstanding of what select() does.
* In MWServer:getStatus(), fixed indexes so that vsize will be correct.
Removed RSS, since it wasn't used anyway and turns out to be measured
in multiples of the page size, and I couldn't be bothered trying to
fetch that from getconf. Return the PID and vsize as numbers rather
than strings.
* Added a simple table dump feature to MWServer:debug().
* Fixed brackets in MWServer:tostring().
* Added missing Linux 32-bit binary.
Change-Id: Ibf5f4656b1c0a9f81287d363184c3fe9d2abdafd
2012-04-16 04:41:08 +00:00
|
|
|
public static function unitTestsList( &$files ) {
|
2012-04-19 07:40:56 +00:00
|
|
|
$tests = array(
|
|
|
|
'engines/LuaStandalone/LuaStandaloneInterpreterTest.php',
|
2013-02-05 00:44:44 +00:00
|
|
|
'engines/LuaStandalone/StandaloneTest.php',
|
2012-04-19 07:40:56 +00:00
|
|
|
'engines/LuaSandbox/LuaSandboxInterpreterTest.php',
|
2013-02-05 00:44:44 +00:00
|
|
|
'engines/LuaSandbox/SandboxTest.php',
|
|
|
|
'engines/LuaCommon/LuaEnvironmentComparisonTest.php',
|
|
|
|
'engines/LuaCommon/CommonTest.php',
|
2013-02-01 20:48:18 +00:00
|
|
|
'engines/LuaCommon/SiteLibraryTest.php',
|
2013-01-26 00:09:50 +00:00
|
|
|
'engines/LuaCommon/UriLibraryTest.php',
|
2012-12-11 02:53:43 +00:00
|
|
|
'engines/LuaCommon/UstringLibraryTest.php',
|
2013-02-08 14:56:44 +00:00
|
|
|
'engines/LuaCommon/MessageLibraryTest.php',
|
2013-02-07 17:50:21 +00:00
|
|
|
'engines/LuaCommon/TitleLibraryTest.php',
|
2013-03-04 20:00:59 +00:00
|
|
|
'engines/LuaCommon/TextLibraryTest.php',
|
2013-12-16 15:00:37 +00:00
|
|
|
'engines/LuaCommon/HtmlLibraryTest.php',
|
2014-08-10 01:34:12 +00:00
|
|
|
'engines/LuaCommon/LanguageLibraryTest.php',
|
|
|
|
'engines/LuaCommon/UstringLibraryPureLuaTest.php',
|
2013-02-05 00:44:44 +00:00
|
|
|
);
|
2012-04-19 07:40:56 +00:00
|
|
|
foreach ( $tests as $test ) {
|
2013-12-16 15:00:37 +00:00
|
|
|
$files[] = __DIR__ . '/../tests/' . $test;
|
2012-04-19 07:40:56 +00:00
|
|
|
}
|
Added tests and fixed bugs
* Added unit tests for the two Lua interpreter classes
* Fixed a bug in checkType()
* Have Scribunto_LuaSandboxInterpreter throw an exception on construct
when the extension doesn't exist, to match the standalone behaviour.
* In Scribunto_LuaSandboxInterpreter, removed debugging statements
accidentally left in.
* Convert LuaSandboxTimeoutError to the appropriate common error
message.
* Moved the option munging from the sandbox engine to the interpreter,
so that the interpreter can be unit tested separately.
* Use /bin/sh instead of bash for lua_ulimit.sh, since dash is smaller
and still supports ulimit.
* Use exec to run the lua binary, so that the vsize of the shell doesn't
add to the memory limit.
* Added a quit function to the standalone interpreter. Unused at present.
* Don't add a comma after the last element of a table in a Lua
expression.
* Make the SIGXCPU detection work: proc_open() runs the command via a
shell, which reports signals in the child via the exit status, so
proc_get_status() will never return a valid termsig element.
* In MWServer:call(), fixed a bug causing the return values to be
wrapped in an array.
* Fixed a misunderstanding of what select() does.
* In MWServer:getStatus(), fixed indexes so that vsize will be correct.
Removed RSS, since it wasn't used anyway and turns out to be measured
in multiples of the page size, and I couldn't be bothered trying to
fetch that from getconf. Return the PID and vsize as numbers rather
than strings.
* Added a simple table dump feature to MWServer:debug().
* Fixed brackets in MWServer:tostring().
* Added missing Linux 32-bit binary.
Change-Id: Ibf5f4656b1c0a9f81287d363184c3fe9d2abdafd
2012-04-16 04:41:08 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-06-15 23:34:35 +00:00
|
|
|
/**
|
|
|
|
* @param $outputPage OutputPage
|
|
|
|
* @param $parserOutput ParserOutput
|
|
|
|
*/
|
2012-04-23 11:36:13 +00:00
|
|
|
public static function parserOutputHook( $outputPage, $parserOutput ) {
|
2014-03-16 02:48:41 +00:00
|
|
|
// Only run the following if we're not on mobile as ext.scribunto doesn't work on mobile. Bug 59808
|
|
|
|
if ( $outputPage->getTarget() === 'mobile' ) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-04-23 11:36:13 +00:00
|
|
|
$outputPage->addModules( 'ext.scribunto' );
|
2014-03-16 02:48:41 +00:00
|
|
|
$outputPage->addInlineScript(
|
|
|
|
'mw.loader.using("ext.scribunto", function() {' .
|
|
|
|
Xml::encodeJsCall( 'mw.scribunto.setErrors', array( $parserOutput->scribunto_errors ) )
|
|
|
|
. '});'
|
|
|
|
);
|
2012-04-23 11:36:13 +00:00
|
|
|
}
|
2013-02-20 22:00:42 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @param &$article Article
|
|
|
|
* @param &$outputDone boolean
|
|
|
|
* @param &$pcache boolean
|
|
|
|
* @return boolean
|
|
|
|
*/
|
2013-03-08 17:01:50 +00:00
|
|
|
public static function showDocPageHeader( &$article, &$outputDone, &$pcache ) {
|
2013-02-20 22:00:42 +00:00
|
|
|
global $wgOut;
|
|
|
|
|
|
|
|
$title = $article->getTitle();
|
2013-03-08 17:01:50 +00:00
|
|
|
if ( Scribunto::isDocPage( $title, $forModule ) ) {
|
2013-02-20 22:00:42 +00:00
|
|
|
$wgOut->addHTML(
|
2013-03-08 17:01:50 +00:00
|
|
|
wfMessage( 'scribunto-doc-page-header', $forModule->getPrefixedText() )->parseAsBlock()
|
2013-02-20 22:00:42 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
2012-01-28 16:22:18 +00:00
|
|
|
}
|