From 69c8791fc5e4f38dc6ade0289b0ce2a49513556d Mon Sep 17 00:00:00 2001
From: Timothee <timothee.callet@combodo.com>
Date: Wed, 3 Jul 2024 16:48:08 +0200
Subject: [PATCH] Fix merge conflit resolution
 d3b996528380c34172e7d8978096dc385a7f3f45

---
 core/cmdbsource.class.inc.php | 94 -----------------------------------
 1 file changed, 94 deletions(-)

diff --git a/core/cmdbsource.class.inc.php b/core/cmdbsource.class.inc.php
index de3523ee0..a5bf616a7 100644
--- a/core/cmdbsource.class.inc.php
+++ b/core/cmdbsource.class.inc.php
@@ -29,100 +29,6 @@ use Combodo\iTop\Core\DbConnectionWrapper;
 require_once('MyHelpers.class.inc.php');
 require_once(APPROOT.'core/kpi.class.inc.php');
 
-class MySQLException extends CoreException
-{
-	/**
-	 * MySQLException constructor.
-	 *
-	 * @param string $sIssue
-	 * @param array $aContext
-	 * @param \Exception $oException
-	 * @param \mysqli $oMysqli to use when working with a custom mysqli instance
-	 */
-	public function __construct($sIssue, $aContext, $oException = null, $oMysqli = null)
-	{
-
-		if ($oException != null)
-		{
-			$aContext['mysql_errno'] = $oException->getCode();
-			$this->code = $oException->getCode();
-			$aContext['mysql_error'] = $oException->getMessage();
-		}
-		else if ($oMysqli != null)
-		{
-			$aContext['mysql_errno'] = $oMysqli->errno;
-			$this->code = $oMysqli->errno;
-			$aContext['mysql_error'] = $oMysqli->error;
-		}
-		else
-		{
-			$aContext['mysql_errno'] = CMDBSource::GetErrNo();
-			$this->code = CMDBSource::GetErrNo();
-			$aContext['mysql_error'] = CMDBSource::GetError();
-		}
-		parent::__construct($sIssue, $aContext);
-		//if is connection error, don't log the default message with password in
-		if (mysqli_connect_errno()) {
-			error_log($this->message);
-			error_reporting(0);
-		}
-	}
-}
-
-/**
- * Class MySQLQueryHasNoResultException
- *
- * @since 2.5.0
- */
-class MySQLQueryHasNoResultException extends MySQLException
-{
-
-}
-
-/**
- * Class MySQLHasGoneAwayException
- *
- * @since 2.5.0
- * @see itop bug 1195
- * @see https://dev.mysql.com/doc/refman/5.7/en/gone-away.html
- */
-class MySQLHasGoneAwayException extends MySQLException
-{
-	/**
-	 * can not be a constant before PHP 5.6 (http://php.net/manual/fr/language.oop5.constants.php)
-	 *
-	 * @return int[]
-	 */
-	public static function getErrorCodes()
-	{
-		return array(
-			2006,
-			2013,
-		);
-	}
-
-	public function __construct($sIssue, $aContext)
-	{
-		parent::__construct($sIssue, $aContext, null);
-	}
-}
-
-/**
- * @since 2.7.0 N°679
- */
-class MySQLNoTransactionException extends MySQLException
-{
-
-}
-
-/**
- * @since 2.7.8 3.0.3 3.1.0 N°5538
- */
-class MySQLTransactionNotClosedException extends MySQLException
-{
-
-}
-
 
 /**
  * CMDBSource