EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327571 )
Change subject: Fix two instances of calling function with too few args
......................................................................
Fix two instances of calling function with too few args
At one point SearchIndexFieldDefinition was updated to require the
engine to be passed in, but it seems that update was missed here.
BackupDumper::loadPlugin() requires the second argument, set it to
the empty string to keep current behaviour.
Change-Id: Ifbd8fc4870ff63b2d338f8bb4d251d7a3477b989
---
M includes/search/DummySearchIndexFieldDefinition.php
M maintenance/backup.inc
M tests/phan/config.php
3 files changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/71/327571/1
diff --git a/includes/search/DummySearchIndexFieldDefinition.php
b/includes/search/DummySearchIndexFieldDefinition.php
index a2a6760..3ee3ed5 100644
--- a/includes/search/DummySearchIndexFieldDefinition.php
+++ b/includes/search/DummySearchIndexFieldDefinition.php
@@ -21,7 +21,7 @@
];
foreach ( $this->subfields as $subfield ) {
- $mapping['subfields'][] = $subfield->getMapping();
+ $mapping['subfields'][] = $subfield->getMapping(
$engine );
}
return $mapping;
diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index 18c7f11..befafc1 100644
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -163,7 +163,7 @@
$val = explode( ':', $param );
if ( count( $val ) === 1 ) {
- $this->loadPlugin( $val[0] );
+ $this->loadPlugin( $val[0], ''
);
} elseif ( count( $val ) === 2 ) {
$this->loadPlugin( $val[0],
$val[1] );
} else {
diff --git a/tests/phan/config.php b/tests/phan/config.php
index 7fc069d..217ce07 100644
--- a/tests/phan/config.php
+++ b/tests/phan/config.php
@@ -307,8 +307,6 @@
"PhanParamSignatureMismatchInternal",
// approximate error count: 1
"PhanParamSpecial1",
- // approximate error count: 2
- "PhanParamTooFew",
// approximate error count: 308
"PhanParamTooMany",
// approximate error count: 3
--
To view, visit https://gerrit.wikimedia.org/r/327571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbd8fc4870ff63b2d338f8bb4d251d7a3477b989
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
