jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327781 )
Change subject: Drop pre-1.29 backwards-compatibility
......................................................................
Drop pre-1.29 backwards-compatibility
Avoids using the deprecated Status::getWarningsArray() this way.
Change-Id: I978328e341d126845f872b50e07db3e306a1acf9
---
M ApiQueryFeatureUsage.php
M extension.json
2 files changed, 3 insertions(+), 17 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
diff --git a/ApiQueryFeatureUsage.php b/ApiQueryFeatureUsage.php
index a67fede..a3a32c6 100644
--- a/ApiQueryFeatureUsage.php
+++ b/ApiQueryFeatureUsage.php
@@ -13,11 +13,7 @@
: $params['agent'];
if ( empty( $agent ) ) {
$encParamName = $this->encodeParamName( 'agent' );
- if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError(
'apierror-apifeatureusage-emptyagent', "bad_$encParamName" );
- } else {
- $this->dieUsage( 'Cannot query an empty user
agent', "bad_$encParamName" );
- }
+ $this->dieWithError(
'apierror-apifeatureusage-emptyagent', "bad_$encParamName" );
}
$conf = ConfigFactory::getDefaultInstance()->makeConfig(
'ApiFeatureUsage' );
@@ -40,17 +36,7 @@
$this->dieStatus( $status );
}
- if ( is_callable( [ $this, 'addMessagesFromStatus' ] ) ) {
- $this->addMessagesFromStatus( $status );
- } else {
- foreach ( $status->getWarningsArray() as $warning ) {
- if ( !$warning instanceof Message ) {
- $key = array_shift( $warning );
- $warning = $this->msg( $key, $warning );
- }
- $this->setWarning( $warning->inLanguage( 'en'
)->useDatabase( false )->plain() );
- }
- }
+ $this->addMessagesFromStatus( $status );
$r = [
'agent' => $agent,
diff --git a/extension.json b/extension.json
index bdefccf..bfbe2a4 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
"license-name": "GPL-2.0+",
"type": "specialpage",
"requires": {
- "MediaWiki": ">= 1.28.0"
+ "MediaWiki": ">= 1.29.0"
},
"ConfigRegistry": {
"ApiFeatureUsage": "GlobalVarConfig::newInstance"
--
To view, visit https://gerrit.wikimedia.org/r/327781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I978328e341d126845f872b50e07db3e306a1acf9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ApiFeatureUsage
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
