Remove Revision::getRevisionText from ApiQueryDeletedrevs

[lhc/web/wiklou.git] / includes / api / ApiUsageException.php

diff --git a/includes/api/ApiUsageException.php b/includes/api/ApiUsageException.php
index 7f8a26b..f930452 100644 (file)
--- a/includes/api/ApiUsageException.php
+++ b/includes/api/ApiUsageException.php
@@ -24,12 +24,8 @@
  * If possible, use ApiBase::dieWithError() instead of throwing this directly.
  *
  * @ingroup API
- * @note This currently extends UsageException for backwards compatibility, so
- *  all the existing code that catches UsageException won't break when stuff
- *  starts throwing ApiUsageException. Eventually UsageException will go away
- *  and this will (probably) extend MWException directly.
  */
-class ApiUsageException extends UsageException implements ILocalizedException {
+class ApiUsageException extends MWException implements ILocalizedException {
 
        protected $modulePath;
        protected $status;
@@ -53,12 +49,7 @@ class ApiUsageException extends UsageException implements ILocalizedException {
                // customized by the local wiki.
                $enMsg = clone $this->getApiMessage();
                $enMsg->inLanguage( 'en' )->useDatabase( false );
-               parent::__construct(
-                       ApiErrorFormatter::stripMarkup( $enMsg->text() ),
-                       $enMsg->getApiCode(),
-                       $httpCode,
-                       $enMsg->getApiData()
-               );
+               parent::__construct( ApiErrorFormatter::stripMarkup( $enMsg->text() ), $httpCode );
        }
 
        /**
@@ -111,32 +102,6 @@ class ApiUsageException extends UsageException implements ILocalizedException {
                return $this->status;
        }
 
-       /**
-        * @deprecated Do not use. This only exists here because UsageException is in
-        *  the inheritance chain for backwards compatibility.
-        * @inheritDoc
-        */
-       public function getCodeString() {
-               wfDeprecated( __METHOD__, '1.29' );
-               return $this->getApiMessage()->getApiCode();
-       }
-
-       /**
-        * @deprecated Do not use. This only exists here because UsageException is in
-        *  the inheritance chain for backwards compatibility.
-        * @inheritDoc
-        */
-       public function getMessageArray() {
-               wfDeprecated( __METHOD__, '1.29' );
-               $enMsg = clone $this->getApiMessage();
-               $enMsg->inLanguage( 'en' )->useDatabase( false );
-
-               return [
-                       'code' => $enMsg->getApiCode(),
-                       'info' => ApiErrorFormatter::stripMarkup( $enMsg->text() ),
-               ] + $enMsg->getApiData();
-       }
-
        /**
         * @inheritDoc
         */