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

Resolve PhanTypeMismatchArgumentNullable after tweak to StatusValue::newFatal

Browse source 
The type hints added in I3e0df790ff9db2fa630f82408a7254a359fe61ca
were sufficient to allow phan to detect that we were possibly passing
a null value in one instance.  The other instance was a false positive.

Follows-Up: I3e0df790ff9db2fa630f82408a7254a359fe61ca
Change-Id: I3bacc2aff3d36719133554a8f70d50a3790b84e4
This commit is contained in:
C. Scott Ananian 2024-11-15 14:19:30 -05:00
parent 1fa7271beb
commit a5aeba739e
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Validator.php
View file

@ -62,14 +62,13 @@ class Validator {
} }
$groupRefs = $this->referenceStack->getGroupRefs( $group ); $groupRefs = $this->referenceStack->getGroupRefs( $group );
// @phan-suppress-next-line PhanTypeMismatchDimFetchNullable false positive if ( $name !== null && isset( $groupRefs[$name] ) && $groupRefs[$name]->extends === null ) {
if ( isset( $groupRefs[$name] ) && $groupRefs[$name]->extends === null ) {
// T242141: A top-level <ref> can't be changed into a sub-reference // T242141: A top-level <ref> can't be changed into a sub-reference
return StatusValue::newFatal( 'cite_error_references_duplicate_key', $name ); return StatusValue::newFatal( 'cite_error_references_duplicate_key', $name );
} elseif ( isset( $groupRefs[$extends] ) && $groupRefs[$extends]->extends !== null ) { } elseif ( isset( $groupRefs[$extends] ) && $groupRefs[$extends]->extends !== null ) {
// A sub-reference can not be extended a second time (no nesting) // A sub-reference can not be extended a second time (no nesting)
return StatusValue::newFatal( 'cite_error_ref_nested_extends', $extends, return StatusValue::newFatal( 'cite_error_ref_nested_extends', $extends,
$groupRefs[$extends]->extends ); $groupRefs[$extends]->extends ?? '' );
} }
} }