jenkins-bot has submitted this change and it was merged.

Change subject: Remove deprecated API help methods
......................................................................


Remove deprecated API help methods

And also getTokenSalt() that was removed long ago.

Change-Id: I4d3de19fb5f9c5cac78a3d0bd6b41e7d80cc41ef
---
M includes/Api/ApiFlow.php
M includes/Api/ApiFlowBase.php
M includes/Api/ApiFlowBaseGet.php
M includes/Api/ApiFlowBasePost.php
4 files changed, 0 insertions(+), 70 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Api/ApiFlow.php b/includes/Api/ApiFlow.php
index 3205350..0afb450 100644
--- a/includes/Api/ApiFlow.php
+++ b/includes/Api/ApiFlow.php
@@ -155,51 +155,6 @@
                );
        }
 
-       /**
-        * Override the parent to generate help messages for all available 
query modules.
-        * @return string
-        */
-       public function makeHelpMsg() {
-
-               // Use parent to make default message for the query module
-               $msg = parent::makeHelpMsg();
-
-               $querySeparator = str_repeat( '--- ', 12 );
-               $moduleSeparator = str_repeat( '*** ', 14 );
-               $msg .= "\n$querySeparator Flow: Submodules  
$querySeparator\n\n";
-               $msg .= $this->makeHelpMsgHelper( 'submodule' );
-               $msg .= "\n\n$moduleSeparator Modules: continuation  
$moduleSeparator\n\n";
-
-               return $msg;
-       }
-
-       /**
-        * For all modules of a given group, generate help messages and join 
them together
-        * @param string $group Module group
-        * @return string
-        */
-       private function makeHelpMsgHelper( $group ) {
-               $moduleDescriptions = array();
-
-               $moduleNames = $this->moduleManager->getNames( $group );
-               sort( $moduleNames );
-               foreach ( $moduleNames as $name ) {
-                       /**
-                        * @var $module ApiFlowBase
-                        */
-                       $module = $this->moduleManager->getModule( $name );
-
-                       $msg = ApiMain::makeHelpMsgHeader( $module, $group );
-                       $msg2 = $module->makeHelpMsg();
-                       if ( $msg2 !== false ) {
-                               $msg .= $msg2;
-                       }
-                       $moduleDescriptions[] = $msg;
-               }
-
-               return implode( "\n", $moduleDescriptions );
-       }
-
        public function getHelpUrls() {
                return array(
                        'https://www.mediawiki.org/wiki/Extension:Flow/API',
@@ -221,10 +176,6 @@
        }
 
        public function needsToken() {
-               return false;
-       }
-
-       public function getTokenSalt() {
                return false;
        }
 }
diff --git a/includes/Api/ApiFlowBase.php b/includes/Api/ApiFlowBase.php
index fd14801..2f0d10a 100644
--- a/includes/Api/ApiFlowBase.php
+++ b/includes/Api/ApiFlowBase.php
@@ -174,13 +174,6 @@
        /**
         * {@inheritDoc}
         */
-       public function getTokenSalt() {
-               return '';
-       }
-
-       /**
-        * {@inheritDoc}
-        */
        public function getParent() {
                return $this->apiFlow;
        }
diff --git a/includes/Api/ApiFlowBaseGet.php b/includes/Api/ApiFlowBaseGet.php
index e67b9ed..005f458 100644
--- a/includes/Api/ApiFlowBaseGet.php
+++ b/includes/Api/ApiFlowBaseGet.php
@@ -79,11 +79,4 @@
        public function needsToken() {
                return false;
        }
-
-       /**
-        * {@inheritDoc}
-        */
-       public function getTokenSalt() {
-               return false;
-       }
 }
diff --git a/includes/Api/ApiFlowBasePost.php b/includes/Api/ApiFlowBasePost.php
index 109f154..6c43208 100644
--- a/includes/Api/ApiFlowBasePost.php
+++ b/includes/Api/ApiFlowBasePost.php
@@ -85,11 +85,4 @@
        public function needsToken() {
                return 'csrf';
        }
-
-       /**
-        * {@inheritDoc}
-        */
-       public function getTokenSalt() {
-               return '';
-       }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d3de19fb5f9c5cac78a3d0bd6b41e7d80cc41ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to