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

Merge "WikiImporter: Improve error message output"

Browse source
This commit is contained in:
jenkins-bot 2023-07-10 15:07:26 +00:00 committed by Gerrit Code Review
commit ea682628e3
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/import/WikiImporter.php
View file

@ -709,8 +709,9 @@ class WikiImporter {
'message' => $error->message, 'message' => $error->message,
] ); ] );
} else { } else {
throw new MWException( "Expected <mediawiki> tag, got " . throw new MWException(
$this->reader->localName ); "Expected '<mediawiki>' tag, got '<{$this->reader->localName}>' tag."
);
} }
} }
$this->debug( "<mediawiki> tag is correct." ); $this->debug( "<mediawiki> tag is correct." );

2
tests/phpunit/includes/import/ImportFailureTest.php
View file

@ -88,7 +88,7 @@ class ImportFailureTest extends MediaWikiLangTestCase {
public static function provideImportFailure() { public static function provideImportFailure() {
yield [ 'BadXML', MWException::class, '/^XML error at line 3: Opening and ending tag mismatch:.*$/' ]; yield [ 'BadXML', MWException::class, '/^XML error at line 3: Opening and ending tag mismatch:.*$/' ];
yield [ 'MissingMediaWikiTag', MWException::class, '/^Expected <mediawiki> tag, got .*$/' ]; yield [ 'MissingMediaWikiTag', MWException::class, "/^Expected '<mediawiki>' tag, got .*$/" ];
yield [ 'MissingMainTextField', MWException::class, '/^Missing text field in import.$/' ]; yield [ 'MissingMainTextField', MWException::class, '/^Missing text field in import.$/' ];
yield [ 'MissingSlotTextField', MWException::class, '/^Missing text field in import.$/' ]; yield [ 'MissingSlotTextField', MWException::class, '/^Missing text field in import.$/' ];
yield [ 'MissingSlotRole', MWException::class, '/^Missing role for imported slot.$/' ]; yield [ 'MissingSlotRole', MWException::class, '/^Missing role for imported slot.$/' ];