Merge "Convert @var Array => array"

[lhc/web/wiklou.git] / includes / libs / rdbms / exception / DBExpectedError.php

diff --git a/includes/libs/rdbms/exception/DBExpectedError.php b/includes/libs/rdbms/exception/DBExpectedError.php
index 4f65efa..cae7f3e 100644 (file)
--- a/includes/libs/rdbms/exception/DBExpectedError.php
+++ b/includes/libs/rdbms/exception/DBExpectedError.php
@@ -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,11 +30,11 @@ 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;
 
-       function __construct( IDatabase $db = null, $error, array $params = [] ) {
+       public function __construct( IDatabase $db = null, $error, array $params = [] ) {
                parent::__construct( $db, $error );
                $this->params = $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' );