Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert Message dependency from DB exception classes

Browse source 
This was added in a90bbf1a.

These classes are in /libs and should not depend on all of MediaWiki.

Change-Id: I67bc818b0c674f1aa3e0dde27a38a9f385fcab75
This commit is contained in:
Aaron Schulz 2017-02-24 08:20:07 -08:00
parent 521ca4768d
commit 2048c04055
3 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/api/ApiErrorFormatter.php
View file

@ -160,6 +160,9 @@ class ApiErrorFormatter {
if ( $exception instanceof ILocalizedException ) {
$msg = $exception->getMessageObject();
$params = [];
} elseif ( $exception instanceof MessageSpecifier ) {
$msg = Message::newFromSpecifier( $exception );
$params = [];
} else {
// Extract code and data from the exception, if applicable
if ( $exception instanceof UsageException ) {

15
includes/api/ApiMain.php
View file

@ -1054,13 +1054,14 @@ class ApiMain extends ApiBase {
if ( ( $e instanceof DBQueryError ) && !$config->get( 'ShowSQLErrors' ) ) {
$params = [ 'apierror-databaseerror', WebRequest::getRequestId() ];
} else {
$params = [
'apierror-exceptioncaught',
WebRequest::getRequestId(),
$e instanceof ILocalizedException
? $e->getMessageObject()
: wfEscapeWikiText( $e->getMessage() )
];
if ( $e instanceof ILocalizedException ) {
$msg = $e->getMessageObject();
} elseif ( $e instanceof MessageSpecifier ) {
$msg = Message::newFromSpecifier( $e );
} else {
$msg = wfEscapeWikiText( $e->getMessage() );
}
$params = [ 'apierror-exceptioncaught', WebRequest::getRequestId(), $msg ];
}
$messages[] = ApiMessage::create( $params, $code );
}

12
includes/libs/rdbms/exception/DBExpectedError.php
View file

@ -22,8 +22,6 @@
namespace Wikimedia\Rdbms;
use MessageSpecifier;
use ILocalizedException;
use Message;
/**
* Base class for the more common types of database errors. These are known to occur
@ -32,7 +30,7 @@ use Message;
* @ingroup Database
* @since 1.23
*/
class DBExpectedError extends DBError implements MessageSpecifier, ILocalizedException {
class DBExpectedError extends DBError implements MessageSpecifier {
/** @var string[] Message parameters */
protected $params;
@ -48,14 +46,6 @@ class DBExpectedError extends DBError implements MessageSpecifier, ILocalizedExc
public function getParams() {
return $this->params;
}
/**
* @inheritDoc
* @since 1.29
*/
public function getMessageObject() {
return Message::newFromSpecifier( $this );
}
}
class_alias( DBExpectedError::class, 'DBExpectedError' );