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

Split isset() check for array and property

Browse source 
Check the array part first and afterwards the property for null,
which does not need the isset() error suppression.

Found by a new phan plugin (2efea9f989)
This bypass a false positive from phan (T378284)

Change-Id: I08651c4b2cd03ecfb38d28ca1cbff599d922208a
This commit is contained in:
Umherirrender 2024-10-28 19:31:58 +01:00
parent 873bee7e20
commit ebd526f2af
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ReferenceListFormatter.php
View file

@ -101,7 +101,7 @@ class ReferenceListFormatter {
// Make sure the parent is not a subreference. // Make sure the parent is not a subreference.
// FIXME: Move to a validation function. // FIXME: Move to a validation function.
$extends =& $ref->extends; $extends =& $ref->extends;
if ( $extends !== null && isset( $groupRefs[$extends]->extends ) ) { if ( $extends !== null && isset( $groupRefs[$extends] ) && $groupRefs[$extends]->extends !== null ) {
$ref->warnings[] = [ 'cite_error_ref_nested_extends', $ref->warnings[] = [ 'cite_error_ref_nested_extends',
$extends, $groupRefs[$extends]->extends ]; $extends, $groupRefs[$extends]->extends ];
} }

2
src/Validator.php
View file

@ -66,7 +66,7 @@ class Validator {
if ( 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]->extends ) ) { } 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 );