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

Introduce named constant for "__placeholder__" string

Browse source 
This is a concept that's only relevant when a sub-reference (formerly
known as BookReferencing) appears before the parent reference it
belongs to. Let the name reflect this.

Bug: T353227
Change-Id: Iabf259e72942ea70cb1cc1e0ca5a5d8cf15d7225
This commit is contained in:
thiemowmde 2023-12-14 09:45:06 +01:00
parent 5b4e869014
commit cb71e87b0e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ReferenceStack.php
View file

@ -74,6 +74,7 @@ class ReferenceStack {
private const ACTION_INCREMENT = 'increment';
private const ACTION_NEW_FROM_PLACEHOLDER = 'new-from-placeholder';
private const ACTION_NEW = 'new';
private const PARENT_REF_PLACEHOLDER = '__placeholder__';
public function __construct( ErrorReporter $errorReporter ) {
$this->errorReporter = $errorReporter;
@ -145,9 +146,9 @@ class ReferenceStack {
// This is an anonymous reference, which will be given a numeric index.
$this->refs[$group][] = &$ref;
$action = self::ACTION_NEW;
} elseif ( isset( $this->refs[$group][$name]['__placeholder__'] ) ) {
} elseif ( isset( $this->refs[$group][$name][self::PARENT_REF_PLACEHOLDER] ) ) {
// Populate a placeholder.
unset( $this->refs[$group][$name]['__placeholder__'] );
unset( $this->refs[$group][$name][self::PARENT_REF_PLACEHOLDER] );
unset( $ref['number'] );
$ref = array_merge( $ref, $this->refs[$group][$name] );
$this->refs[$group][$name] =& $ref;
@ -204,7 +205,7 @@ class ReferenceStack {
// Transfer my number to parent ref.
$this->refs[$group][$extends] = [
'number' => $ref['number'],
'__placeholder__' => true,
self::PARENT_REF_PLACEHOLDER => true,
];
}
} elseif ( $extends && $ref['extends'] !== $extends ) {
@ -323,7 +324,7 @@ class ReferenceStack {
// TODO: Don't we need to rollback extendsCount as well?
break;
case self::ACTION_NEW_FROM_PLACEHOLDER:
$this->refs[$group][$lookup]['__placeholder__'] = true;
$this->refs[$group][$lookup][self::PARENT_REF_PLACEHOLDER] = true;
unset( $this->refs[$group][$lookup]['count'] );
break;
case self::ACTION_ASSIGN: