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

Merge "Clean up text and name conditionals"

Browse source
This commit is contained in:
jenkins-bot 2019-12-01 10:02:41 +00:00 committed by Gerrit Code Review
parent f24f77d4c4 ffedf86a19
commit 76ef4af51f
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Cite.php
View file

@ -203,6 +203,7 @@ class Cite {
return StatusValue::newFatal( 'cite_error_references_no_key' );
}
// This doesn't catch the null case because that's guaranteed to trigger other errors
if ( $text === '' ) {
// <ref> called in <references> has no content.
return StatusValue::newFatal(
@ -230,16 +231,14 @@ class Cite {
} else {
// Not in a references tag
if ( $text !== null && trim( $text ) === '' && !$name ) {
// Must have content or reuse another ref by name.
// TODO: Trim text before validation.
return StatusValue::newFatal( 'cite_error_ref_no_input' );
}
if ( $text === null && $name === null ) {
// Something like <ref />; this makes no sense.
// TODO: Is this redundant with no_input?
return StatusValue::newFatal( 'cite_error_ref_no_key' );
if ( !$name ) {
if ( $text === null ) {
// Something like <ref />; this makes no sense.
return StatusValue::newFatal( 'cite_error_ref_no_key' );
} elseif ( trim( $text ) === '' ) {
// Must have content or reuse another ref by name.
return StatusValue::newFatal( 'cite_error_ref_no_input' );
}
}
if ( preg_match( '/<ref\b[^<]*?>/',
@ -305,6 +304,11 @@ class Cite {
$status->merge( $this->validateRef( $text, $name, $group, $follow, $extends ) );
// Validation cares about the difference between null and empty, but from here on we don't
if ( $text !== null && trim( $text ) === '' ) {
$text = null;
}
if ( $this->inReferencesGroup !== null ) {
if ( !$status->isOK() ) {
foreach ( $status->getErrors() as $error ) {
@ -332,10 +336,6 @@ class Cite {
return '';
}
if ( $text !== null && trim( $text ) === '' && $name ) {
$text = null;
}
if ( !$status->isOK() ) {
$this->referenceStack->pushInvalidRef();
@ -429,7 +429,7 @@ class Cite {
[ 'group' => $group, 'responsive' => $responsive ] = $status->getValue();
$this->inReferencesGroup = $group ?? self::DEFAULT_GROUP;
if ( strval( $text ) !== '' ) {
if ( $text !== null && trim( $text ) !== '' ) {
# Detect whether we were sent already rendered <ref>s.
# Mostly a side effect of using #tag to call references.
# The following assumes that the parsed <ref>s sent within

2
src/FootnoteBodyFormatter.php
View file

@ -181,7 +181,7 @@ class FootnoteBodyFormatter {
* @return string
*/
private function referenceText( $key, ?string $text, bool $isSectionPreview ) {
if ( trim( $text ) === '' ) {
if ( $text === null ) {
if ( $isSectionPreview ) {
return $this->errorReporter->plain( 'cite_warning_sectionpreview_no_text', $key );
}

4
src/ReferenceStack.php
View file

@ -190,14 +190,14 @@ class ReferenceStack {
// Change an existing entry.
$ref =& $this->refs[$group][$name];
$ref['count']++;
if ( $ref['text'] === null && $text !== '' ) {
if ( $ref['text'] === null && $text !== null ) {
// If no text was set before, use this text
$ref['text'] = $text;
// Use the dir parameter only from the full definition of a named ref tag
$ref['dir'] = $dir;
$action = 'assign';
} else {
if ( $text != null && $text !== ''
if ( $text !== null
// T205803 different strip markers might hide the same text
&& $stripState->unstripBoth( $text )
!== $stripState->unstripBoth( $ref['text'] )