From 78b78644fb69a28f5719de7aa6f0215c6a17b715 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Wed, 30 Aug 2017 16:44:35 -0700 Subject: [PATCH] DB excepions: consistently declare constructors as public Also DBTransactionSizeError::getKey() while we're here Change-Id: Ic76abf3ca0bf74dd96018d67da466365957bf3b1 --- includes/libs/rdbms/exception/DBConnectionError.php | 2 +- includes/libs/rdbms/exception/DBError.php | 2 +- includes/libs/rdbms/exception/DBExpectedError.php | 2 +- includes/libs/rdbms/exception/DBQueryError.php | 2 +- includes/libs/rdbms/exception/DBTransactionSizeError.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/includes/libs/rdbms/exception/DBConnectionError.php b/includes/libs/rdbms/exception/DBConnectionError.php index 0091524c91..91d98dc145 100644 --- a/includes/libs/rdbms/exception/DBConnectionError.php +++ b/includes/libs/rdbms/exception/DBConnectionError.php @@ -28,7 +28,7 @@ class DBConnectionError extends DBExpectedError { * @param IDatabase $db Object throwing the error * @param string $error Error text */ - function __construct( IDatabase $db = null, $error = 'unknown error' ) { + public function __construct( IDatabase $db = null, $error = 'unknown error' ) { $msg = 'Cannot access the database'; if ( trim( $error ) != '' ) { $msg .= ": $error"; diff --git a/includes/libs/rdbms/exception/DBError.php b/includes/libs/rdbms/exception/DBError.php index d65e2d36bd..2f7499bc64 100644 --- a/includes/libs/rdbms/exception/DBError.php +++ b/includes/libs/rdbms/exception/DBError.php @@ -36,7 +36,7 @@ class DBError extends Exception { * @param IDatabase $db Object which threw the error * @param string $error A simple error message to be used for debugging */ - function __construct( IDatabase $db = null, $error ) { + public function __construct( IDatabase $db = null, $error ) { $this->db = $db; parent::__construct( $error ); } diff --git a/includes/libs/rdbms/exception/DBExpectedError.php b/includes/libs/rdbms/exception/DBExpectedError.php index 4f65efae02..31d8c27d9f 100644 --- a/includes/libs/rdbms/exception/DBExpectedError.php +++ b/includes/libs/rdbms/exception/DBExpectedError.php @@ -36,7 +36,7 @@ class DBExpectedError extends DBError implements MessageSpecifier, ILocalizedExc /** @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; } diff --git a/includes/libs/rdbms/exception/DBQueryError.php b/includes/libs/rdbms/exception/DBQueryError.php index 6a4076f870..a8ea3ade42 100644 --- a/includes/libs/rdbms/exception/DBQueryError.php +++ b/includes/libs/rdbms/exception/DBQueryError.php @@ -41,7 +41,7 @@ class DBQueryError extends DBExpectedError { * @param string $sql * @param string $fname */ - function __construct( IDatabase $db, $error, $errno, $sql, $fname ) { + public function __construct( IDatabase $db, $error, $errno, $sql, $fname ) { if ( $db instanceof Database && $db->wasConnectionError( $errno ) ) { $message = "A connection error occured. \n" . "Query: $sql\n" . diff --git a/includes/libs/rdbms/exception/DBTransactionSizeError.php b/includes/libs/rdbms/exception/DBTransactionSizeError.php index e45b9f3191..d2622e11a7 100644 --- a/includes/libs/rdbms/exception/DBTransactionSizeError.php +++ b/includes/libs/rdbms/exception/DBTransactionSizeError.php @@ -25,7 +25,7 @@ namespace Wikimedia\Rdbms; * @ingroup Database */ class DBTransactionSizeError extends DBTransactionError { - function getKey() { + public function getKey() { return 'transaction-duration-limit-exceeded'; } } -- 2.20.1