X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiUsageException.php;h=7f8a26b89aa9181df3f667047baf491204a824de;hb=3ce5436159eabb35bc1e41968bc26a68b4a62cb4;hp=47902a75b0a3cede6251c0023368f1b68baa1aca;hpb=53ecf20db8bfc2109553e80bf932dac7321d63ec;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiUsageException.php b/includes/api/ApiUsageException.php
index 47902a75b0..7f8a26b89a 100644
--- a/includes/api/ApiUsageException.php
+++ b/includes/api/ApiUsageException.php
@@ -16,80 +16,8 @@
  * http://www.gnu.org/copyleft/gpl.html
  *
  * @file
- * @defgroup API API
  */
 
-/**
- * This exception will be thrown when dieUsage is called to stop module execution.
- *
- * @ingroup API
- * @deprecated since 1.29, use ApiUsageException instead
- */
-class UsageException extends MWException {
-
-	private $mCodestr;
-
-	/**
-	 * @var null|array
-	 */
-	private $mExtraData;
-
-	/**
-	 * @param string $message
-	 * @param string $codestr
-	 * @param int $code
-	 * @param array|null $extradata
-	 */
-	public function __construct( $message, $codestr, $code = 0, $extradata = null ) {
-		parent::__construct( $message, $code );
-		$this->mCodestr = $codestr;
-		$this->mExtraData = $extradata;
-
-		if ( !$this instanceof ApiUsageException ) {
-			wfDeprecated( __METHOD__, '1.29' );
-		}
-
-		// This should never happen, so throw an exception about it that will
-		// hopefully get logged with a backtrace (T138585)
-		if ( !is_string( $codestr ) || $codestr === '' ) {
-			throw new InvalidArgumentException( 'Invalid $codestr, was ' .
-				( $codestr === '' ? 'empty string' : gettype( $codestr ) )
-			);
-		}
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getCodeString() {
-		wfDeprecated( __METHOD__, '1.29' );
-		return $this->mCodestr;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getMessageArray() {
-		wfDeprecated( __METHOD__, '1.29' );
-		$result = [
-			'code' => $this->mCodestr,
-			'info' => $this->getMessage()
-		];
-		if ( is_array( $this->mExtraData ) ) {
-			$result = array_merge( $result, $this->mExtraData );
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function __toString() {
-		return "{$this->getCodeString()}: {$this->getMessage()}";
-	}
-}
-
 /**
  * Exception used to abort API execution with an error
  *
@@ -213,7 +141,7 @@ class ApiUsageException extends UsageException implements ILocalizedException {
 	 * @inheritDoc
 	 */
 	public function getMessageObject() {
-		return $this->status->getMessage();
+		return Status::wrap( $this->status )->getMessage();
 	}
 
 	/**