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

Show error when extending a subreference

Browse source 
Change-Id: Iaa47e302e5e49dfc190fde37567a3e7a2e743d67
This commit is contained in:
Adam Wight 2019-12-04 11:59:56 +01:00
parent 484373c21e
commit 81261493c2
3 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/FootnoteBodyFormatter.php
View file

@ -98,6 +98,14 @@ class FootnoteBodyFormatter {
$parserInput .= $this->closeIndention( $indented );
$indented = false;
}
// Make sure the parent is not a subreference.
// FIXME: Move to a validation function.
if ( isset( $value['extends'] ) &&
isset( $groupRefs[$value['extends']]['extends'] )
) {
$value['text'] = ( $value['text'] ?? '' ) .
$this->errorReporter->plain( 'cite_error_ref_too_many_keys' );
}
$parserInput .= $this->referencesFormatEntry( $key, $value, $isSectionPreview ) . "\n";
}
$parserInput .= $this->closeIndention( $indented );
@ -144,9 +152,6 @@ class FootnoteBodyFormatter {
$error = '';
$extraAttributes = '';
// TODO: Show an error if isset( $val['__placeholder__'] ), this is caused by extends
// with a missing parent.
if ( isset( $val['dir'] ) ) {
$dir = strtolower( $val['dir'] );
if ( in_array( $dir, [ 'ltr', 'rtl' ] ) ) {

5
tests/parser/bookReferencing.txt
View file

@ -164,8 +164,6 @@ wgCiteBookReferencing=true
</ol></div>
!! end
# TODO:
# * Should render an error on ref-3.
!! test
T236256 - Can't extend a book reference (no nesting).
!! config
@ -184,7 +182,8 @@ wgCiteBookReferencing=true
<li id="cite_note-a-1"><span class="mw-cite-backlink"><a href="#cite_ref-a_1-0">↑</a></span> <span class="reference-text">book</span>
<ol class="mw-extended-references"><li id="cite_note-b-2"><span class="mw-cite-backlink"><a href="#cite_ref-b_2-0">↑</a></span> <span class="reference-text">page 2</span>
</li>
<li id="cite_note-3"><span class="mw-cite-backlink"><a href="#cite_ref-3">↑</a></span> <span class="reference-text">section 3</span>
<li id="cite_note-3"><span class="mw-cite-backlink"><a href="#cite_ref-3">↑</a></span> <span class="reference-text">section 3<span class="error mw-ext-cite-error" lang="en" dir="ltr">Cite error: Invalid <code>&lt;ref&gt;</code> tag;
invalid names, e.g. too many</span></span>
</li>
</ol></li>
</ol></div>

40
tests/phpunit/unit/FootnoteBodyFormatterTest.php
View file

@ -27,6 +27,13 @@ class FootnoteBodyFormatterTest extends MediaWikiUnitTestCase {
$mockParser = $this->createMock( Parser::class );
$mockParser->method( 'recursiveTagParse' )->willReturnArgument( 0 );
/** @var Parser $mockParser */
$mockErrorReporter = $this->createMock( CiteErrorReporter::class );
$mockErrorReporter->method( 'plain' )->willReturnCallback(
function ( ...$args ) {
return json_encode( $args );
}
);
/** @var CiteErrorReporter $mockErrorReporter */
$mockMessageLocalizer = $this->createMock( ReferenceMessageLocalizer::class );
$mockMessageLocalizer->method( 'msg' )->willReturnCallback(
function ( ...$args ) {
@ -41,7 +48,7 @@ class FootnoteBodyFormatterTest extends MediaWikiUnitTestCase {
/** @var FootnoteBodyFormatter $formatter */
$formatter = TestingAccessWrapper::newFromObject( new FootnoteBodyFormatter(
$mockParser,
$this->createMock( CiteErrorReporter::class ),
$mockErrorReporter,
$this->createMock( CiteKeyFormatter::class ),
$mockMessageLocalizer ) );
@ -94,6 +101,37 @@ class FootnoteBodyFormatterTest extends MediaWikiUnitTestCase {
"\n|)</li>\n" .
'</ol></div>'
],
'Subref of subref' => [
[
0 => [
'extends' => 'a',
'extendsIndex' => 1,
'key' => 1,
'number' => 1,
'text' => 't1',
],
'a' => [
'extends' => 'b',
'extendsIndex' => 1,
'key' => 2,
'number' => 1,
'text' => 't2',
],
'b' => [
'key' => 3,
'number' => 1,
'text' => 't3',
],
],
'<div class="mw-references-wrap"><ol class="references">' . "\n" .
'<li>(cite_references_link_many|||<span class="reference-text">t3</span>' . "\n" .
'|)<ol class="mw-extended-references"><li>(cite_references_link_many|||' .
'<span class="reference-text">t1["cite_error_ref_too_many_keys"]</span>' .
"\n|)</li>\n" .
'<li>(cite_references_link_many|||<span class="reference-text">t2</span>' .
"\n|)</li>\n</ol></li>\n" .
'</ol></div>'
],
'Use columns' => [
[
0 => [ 'key' => 1, 'text' => 't' ],