X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2Fapi%2FApiUsageException.php;h=f93045273703e203e55404a8a60d61de8485868b;hb=ab2e77bb5d228683c2458bcec16559ac10cd2c01;hp=7f8a26b89aa9181df3f667047baf491204a824de;hpb=f459a71f75941a83335d6d63ee12079a4b586793;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiUsageException.php b/includes/api/ApiUsageException.php
index 7f8a26b89a..f930452737 100644
--- 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
 	 */