Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "resourceloader: Allow using FilePath directly in 'packageFiles' array"

Browse source
This commit is contained in:
jenkins-bot 2022-05-27 22:21:52 +00:00 committed by Gerrit Code Review
commit 9353eb69e0
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/ResourceLoader/FileModule.php
View file

@ -1262,7 +1262,7 @@ class FileModule extends Module {
$mainFile = null;
foreach ( $this->packageFiles as $key => $fileInfo ) {
if ( is_string( $fileInfo ) ) {
if ( !is_array( $fileInfo ) ) {
$fileInfo = [ 'name' => $fileInfo, 'file' => $fileInfo ];
}
if ( !isset( $fileInfo['name'] ) ) {
@ -1271,7 +1271,7 @@ class FileModule extends Module {
$this->getLogger()->error( $msg );
throw new LogicException( $msg );
}
$fileName = $fileInfo['name'];
$fileName = $this->getPath( $fileInfo['name'] );
// Infer type from alias if needed
$type = $fileInfo['type'] ?? self::getPackageFileType( $fileName );

10
tests/qunit/QUnitTestResources.php
View file

@ -27,14 +27,8 @@ return [
'localBasePath' => "{$GLOBALS['IP']}/resources/src/mediawiki.language/languages",
'remoteBasePath' => "{$GLOBALS['wgResourceBasePath']}/resources/src/mediawiki.language/languages",
'packageFiles' => [
[
'name' => 'mediawiki.jqueryMsg.testdata.js',
'file' => new FilePath( __DIR__ . '/data/mediawiki.jqueryMsg.testdata.js', '' ),
],
[
'name' => 'mediawiki.jqueryMsg.data.json',
'file' => new FilePath( __DIR__ . '/data/mediawiki.jqueryMsg.data.json', '' ),
],
new FilePath( 'mediawiki.jqueryMsg.testdata.js', __DIR__ . '/data' ),
new FilePath( 'mediawiki.jqueryMsg.data.json', __DIR__ . '/data' ),
'bs.js',
'dsb.js',
'fi.js',