From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 29 Aug 2016 22:48:01 +0000 (-0700)
Subject: Move some DB error classes with the rest as type DBUnexpectedError
X-Git-Tag: 1.31.0-rc.0~5841^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=9b81de7960e8a71b9bb59da8f9cb483c9be49d03;p=lhc%2Fweb%2Fwiklou.git

Move some DB error classes with the rest as type DBUnexpectedError

Change-Id: I97d61d32495e6d88ce274772369390c76d7ff3c4
---

diff --git a/autoload.php b/autoload.php
index 39102fd358..dec72192ef 100644
--- a/autoload.php
+++ b/autoload.php
@@ -297,7 +297,7 @@ $wgAutoloadLocalClasses = [
 	'CsvStatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
 	'CurlHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
 	'DBAccessBase' => __DIR__ . '/includes/dao/DBAccessBase.php',
-	'DBAccessError' => __DIR__ . '/includes/db/loadbalancer/LBFactory.php',
+	'DBAccessError' => __DIR__ . '/includes/db/DatabaseError.php',
 	'DBAccessObjectUtils' => __DIR__ . '/includes/dao/DBAccessObjectUtils.php',
 	'DBConnRef' => __DIR__ . '/includes/db/DBConnRef.php',
 	'DBConnectionError' => __DIR__ . '/includes/db/DatabaseError.php',
@@ -308,7 +308,7 @@ $wgAutoloadLocalClasses = [
 	'DBMasterPos' => __DIR__ . '/includes/db/DatabaseUtility.php',
 	'DBQueryError' => __DIR__ . '/includes/db/DatabaseError.php',
 	'DBReadOnlyError' => __DIR__ . '/includes/db/DatabaseError.php',
-	'DBReplicationWaitError' => __DIR__ . '/includes/db/loadbalancer/LBFactory.php',
+	'DBReplicationWaitError' => __DIR__ . '/includes/db/DatabaseError.php',
 	'DBSiteStore' => __DIR__ . '/includes/site/DBSiteStore.php',
 	'DBTransactionError' => __DIR__ . '/includes/db/DatabaseError.php',
 	'DBUnexpectedError' => __DIR__ . '/includes/db/DatabaseError.php',
diff --git a/includes/db/DatabaseError.php b/includes/db/DatabaseError.php
index 4cd02b1f61..cfae74fdfd 100644
--- a/includes/db/DatabaseError.php
+++ b/includes/db/DatabaseError.php
@@ -470,3 +470,21 @@ class DBReadOnlyError extends DBExpectedError {
  */
 class DBTransactionError extends DBExpectedError {
 }
+
+/**
+ * Exception class for attempted DB access
+ * @ingroup Database
+ */
+class DBAccessError extends DBUnexpectedError {
+	public function __construct() {
+		parent::__construct( "Mediawiki tried to access the database via wfGetDB(). " .
+			"This is not allowed, because database access has been disabled." );
+	}
+}
+
+/**
+ * Exception class for replica DB wait timeouts
+ * @ingroup Database
+ */
+class DBReplicationWaitError extends DBUnexpectedError {
+}
diff --git a/includes/db/loadbalancer/LBFactory.php b/includes/db/loadbalancer/LBFactory.php
index 84f7fcb3d2..dfa4c292fa 100644
--- a/includes/db/loadbalancer/LBFactory.php
+++ b/includes/db/loadbalancer/LBFactory.php
@@ -539,19 +539,3 @@ abstract class LBFactory implements DestructibleService {
 	}
 
 }
-
-/**
- * Exception class for attempted DB access
- */
-class DBAccessError extends MWException {
-	public function __construct() {
-		parent::__construct( "Mediawiki tried to access the database via wfGetDB(). " .
-			"This is not allowed, because database access has been disabled." );
-	}
-}
-
-/**
- * Exception class for replica DB wait timeouts
- */
-class DBReplicationWaitError extends Exception {
-}