wikimedia/mediawiki-extensions-Scribunto
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Scribunto synced 2024-11-27 17:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Updating composer dependencies

Browse source 
* mediawiki/minus-x: 0.3.2 → 1.0.0
* jakub-onderka/php-console-highlighter: 0.3.2 → 0.4.0
* mediawiki/mediawiki-phan-config: 0.9.0 → 0.9.1

Change-Id: Ibdedddbf19eb4712c31c1b95024391ff013f73e8
This commit is contained in:
libraryupgrader 2020-01-30 03:53:43 +00:00 committed by Thiemo Kreuz (WMDE)
parent 633ff1ff2d
commit 7b2cda5591
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
composer.json
View file

@ -3,9 +3,9 @@
"jakub-onderka/php-parallel-lint": "1.0.0",
"mediawiki/mediawiki-codesniffer": "29.0.0",
"mediawiki/lua-sandbox": "3.0.1",
"mediawiki/minus-x": "0.3.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
"mediawiki/mediawiki-phan-config": "0.9.0"
"mediawiki/minus-x": "1.0.0",
"jakub-onderka/php-console-highlighter": "0.4.0",
"mediawiki/mediawiki-phan-config": "0.9.1"
},
"repositories": [
{

4
includes/common/ApiScribuntoConsole.php
View file

@ -9,6 +9,9 @@ class ApiScribuntoConsole extends ApiBase {
const SC_MAX_SIZE = 500000;
const SC_SESSION_EXPIRY = 3600;
/**
* @suppress PhanTypePossiblyInvalidDimOffset
*/
public function execute() {
$params = $this->extractRequestParams();
@ -60,7 +63,6 @@ class ApiScribuntoConsole extends ApiBase {
}
$result = $this->runConsole( [
'title' => $title,
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset
'content' => $newSession['content'],
'prevQuestions' => $session['questions'],
'question' => $params['question'],

2
includes/engines/LuaCommon/TitleLibrary.php
View file

@ -182,8 +182,8 @@ class Scribunto_LuaTitleLibrary extends Scribunto_LuaLibraryBase {
return [ null ];
}
} else {
// This will always fail
$this->checkType( 'title.new', 1, $text_or_id, 'number or string' );
throw new LogicException( 'checkType above should have failed' );
}
return [ $this->getInexpensiveTitleData( $title ) ];

2
includes/engines/LuaCommon/UstringLibrary.php
View file

@ -884,6 +884,7 @@ class Scribunto_LuaUstringLibrary extends Scribunto_LuaLibraryBase {
default:
$this->checkType( 'gsub', 3, $repl, 'function or table or string' );
throw new LogicException( 'checkType above should have failed' );
}
$skippedMatches = 0;
@ -906,7 +907,6 @@ class Scribunto_LuaUstringLibrary extends Scribunto_LuaLibraryBase {
}
$count = 0;
// @phan-suppress-next-line PhanTypeMismatchArgumentNullableInternal
$s2 = preg_replace_callback( $re, $cb, $s, $n, $count );
if ( $s2 === null ) {
self::handlePCREError( preg_last_error(), $pattern );

4
includes/engines/LuaStandalone/LuaStandaloneInterpreter.php
View file

@ -148,7 +148,6 @@ class Scribunto_LuaStandaloneInterpreter extends Scribunto_LuaInterpreter {
[
[ 'pipe', 'r' ],
[ 'pipe', 'w' ],
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset
[ 'file', $options['errorFile'], 'a' ]
],
$pipes );
@ -644,14 +643,11 @@ class Scribunto_LuaStandaloneInterpreter extends Scribunto_LuaInterpreter {
$status['termsig'] = $status['exitcode'] - 128;
}
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset
if ( $status['signaled'] ) {
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset
if ( defined( 'SIGXCPU' ) && $status['termsig'] === SIGXCPU ) {
$this->exitError = $this->engine->newException( 'scribunto-common-timeout' );
} else {
$this->exitError = $this->engine->newException( 'scribunto-luastandalone-signal',
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset
[ 'args' => [ $status['termsig'] ] ] );
}
} else {