X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Fexception%2FDBQueryError.php;h=89b9cea61a137a0a9d8e67485d07b6cf09277df7;hb=3df3b575c6617df64ec98533cc7141bd2314e274;hp=b4c3d529f58b79398f7879d178ddd43543c102d9;hpb=d1380bfdd134e6b5a0345ab5a280ed9ccb2eca6c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/rdbms/exception/DBQueryError.php b/includes/libs/rdbms/exception/DBQueryError.php
index b4c3d529f5..e6870a7e2e 100644
--- a/includes/libs/rdbms/exception/DBQueryError.php
+++ b/includes/libs/rdbms/exception/DBQueryError.php
@@ -18,7 +18,8 @@
  * @file
  * @ingroup Database
  */
-use Wikimedia\Rdbms\IDatabase;
+
+namespace Wikimedia\Rdbms;
 
 /**
  * @ingroup Database
@@ -26,7 +27,7 @@ use Wikimedia\Rdbms\IDatabase;
 class DBQueryError extends DBExpectedError {
 	/** @var string */
 	public $error;
-	/** @var integer */
+	/** @var int */
 	public $errno;
 	/** @var string */
 	public $sql;
@@ -39,19 +40,22 @@ class DBQueryError extends DBExpectedError {
 	 * @param int|string $errno
 	 * @param string $sql
 	 * @param string $fname
+	 * @param string $message Optional message, intended for subclases (optional)
 	 */
-	function __construct( IDatabase $db, $error, $errno, $sql, $fname ) {
-		if ( $db instanceof Database && $db->wasConnectionError( $errno ) ) {
-			$message = "A connection error occured. \n" .
-				"Query: $sql\n" .
-				"Function: $fname\n" .
-				"Error: $errno $error\n";
-		} else {
-			$message = "A database query error has occurred. Did you forget to run " .
-				"your application's database schema updater after upgrading? \n" .
-				"Query: $sql\n" .
-				"Function: $fname\n" .
-				"Error: $errno $error\n";
+	public function __construct( IDatabase $db, $error, $errno, $sql, $fname, $message = null ) {
+		if ( $message === null ) {
+			if ( $db instanceof Database && $db->wasConnectionError( $errno ) ) {
+				$message = "A connection error occured. \n" .
+					 "Query: $sql\n" .
+					 "Function: $fname\n" .
+					 "Error: $errno $error\n";
+			} else {
+				$message = "A database query error has occurred. Did you forget to run " .
+					 "your application's database schema updater after upgrading? \n" .
+					 "Query: $sql\n" .
+					 "Function: $fname\n" .
+					 "Error: $errno $error\n";
+			}
 		}
 
 		parent::__construct( $db, $message );
@@ -62,3 +66,5 @@ class DBQueryError extends DBExpectedError {
 		$this->fname = $fname;
 	}
 }
+
+class_alias( DBQueryError::class, 'DBQueryError' );