Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/248904

Change subject: API: Remove pre-1.25 compat code
......................................................................

API: Remove pre-1.25 compat code

We already require at least 1.26.

Change-Id: I09ca09fd06fdbf0b367f8a454898c6b7992be42d
---
M includes/api/ApiEchoMarkRead.php
M includes/api/ApiEchoMarkSeen.php
M includes/api/ApiEchoNotifications.php
3 files changed, 1 insertion(+), 92 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/04/248904/1

diff --git a/includes/api/ApiEchoMarkRead.php b/includes/api/ApiEchoMarkRead.php
index 13e069e..2920c5f 100644
--- a/includes/api/ApiEchoMarkRead.php
+++ b/includes/api/ApiEchoMarkRead.php
@@ -66,18 +66,6 @@
                );
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               return array(
-                       'list' => 'A list of notification IDs to mark as read',
-                       'all' => "If set to true, marks all of a user's 
notifications as read",
-                       'sections' => 'A list of sections to mark as read',
-                       'token' => 'edit token',
-               );
-       }
-
        public function needsToken() {
                return 'csrf';
        }
@@ -92,23 +80,6 @@
 
        public function isWriteMode() {
                return true;
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Mark notifications as read for the current user';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getExamples() {
-               return array(
-                       'api.php?action=echomarkread&list=8',
-                       'api.php?action=echomarkread&all=true'
-               );
        }
 
        /**
diff --git a/includes/api/ApiEchoMarkSeen.php b/includes/api/ApiEchoMarkSeen.php
index ce4e442..61ef320 100644
--- a/includes/api/ApiEchoMarkSeen.php
+++ b/includes/api/ApiEchoMarkSeen.php
@@ -34,15 +34,6 @@
                );
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               return array(
-                       'token' => 'edit token',
-               );
-       }
-
        public function needsToken() {
                return 'csrf';
        }
@@ -57,22 +48,6 @@
 
        public function isWriteMode() {
                return true;
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Mark notifications as seen for the current user';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getExamples() {
-               return array(
-                       'api.php?action=echomarkseen',
-               );
        }
 
        /**
diff --git a/includes/api/ApiEchoNotifications.php 
b/includes/api/ApiEchoNotifications.php
index f385d5e..d0efeed 100644
--- a/includes/api/ApiEchoNotifications.php
+++ b/includes/api/ApiEchoNotifications.php
@@ -242,8 +242,7 @@
                        ),
                        'index' => false,
                        'continue' => array(
-                               /** @todo Once support for MediaWiki < 1.25 is 
dropped, just use ApiBase::PARAM_HELP_MSG directly */
-                               constant( 'ApiBase::PARAM_HELP_MSG' ) ?: '' => 
'api-help-param-continue',
+                               ApiBase::PARAM_HELP_MSG => 
'api-help-param-continue',
                        ),
                );
                foreach ( $sections as $section ) {
@@ -255,42 +254,6 @@
                }
 
                return $params;
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               return array(
-                       'prop' => 'Details to request.',
-                       'sections' => 'The notification sections to query (i.e. 
some combination of \'alert\' and \'message\').',
-                       'groupbysection' => 'Whether to group the result by 
section, each section is fetched separately if set',
-                       'format' => 'If specified, notifications will be 
returned formatted this way.',
-                       'index' => 'If specified, a list of notification IDs, 
in order, will be returned.',
-                       'limit' => 'The maximum number of notifications to 
return.',
-                       'continue' => 'When more results are available, use 
this to continue, this is used only when groupbysection is not set.',
-                       'alertcontinue' => 'When more alert results are 
available, use this to continue.',
-                       'messagecontinue' => 'When more message results are 
available, use this to continue.',
-                       'alertunreadfirst' => 'Whether to show unread message 
notifications first',
-                       'messageunreadfirst' => 'Whether to show unread alert 
notifications first'
-               );
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Get notifications waiting for the current user';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getExamples() {
-               return array(
-                       'api.php?action=query&meta=notifications',
-                       
'api.php?action=query&meta=notifications&notprop=count&notsections=alert|message&notgroupbysection=1',
-               );
        }
 
        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/248904
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09ca09fd06fdbf0b367f8a454898c6b7992be42d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to