chore(php): Use public OCP\DB\Exception instead of private DbalException

lib/Db/EventWrapperRequest.php

@@ -11,8 +11,8 @@
 
 namespace OCA\Circles\Db;
 
-use OC\DB\Exceptions\DbalException;
 use OCA\Circles\Model\Federated\EventWrapper;
+use OCP\DB\Exception;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -42,8 +42,8 @@ public function save(EventWrapper $wrapper): void {
 
 		try {
 			$qb->executeStatement();
-		} catch (DbalException $e) {
-			if ($e->getReason() !== DbalException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+		} catch (Exception $e) {
+			if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
 				throw $e;
 			}
 

lib/Db/TokensRequest.php

@@ -8,10 +8,10 @@
 
 namespace OCA\Circles\Db;
 
-use OC\DB\Exceptions\DbalException;
 use OCA\Circles\Exceptions\TokenDoesNotExistException;
 use OCA\Circles\Model\DeprecatedMember;
 use OCA\Circles\Model\SharesToken;
+use OCP\DB\Exception;
 use OCP\Security\IHasher;
 use OCP\Server;
 
@@ -116,8 +116,8 @@ public function generateTokenForMember(DeprecatedMember $member, int $shareId, s
 
 			$qb->execute();
 			$qb->executeStatement();
-		} catch (DbalException $e) {
-			if ($e->getReason() !== DbalException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+		} catch (Exception $e) {
+			if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
 				throw $e;
 			}
 		}

lib/MountManager/CircleMountProvider.php

@@ -8,8 +8,6 @@
 
 namespace OCA\Circles\MountManager;
 
-use Exception;
-use OC\DB\Exceptions\DbalException;
 use OCA\Circles\Db\MountPointRequest;
 use OCA\Circles\Db\MountRequest;
 use OCA\Circles\Exceptions\FederatedUserException;
@@ -28,6 +26,7 @@
 use OCA\Circles\Service\FederatedUserService;
 use OCA\Circles\Tools\Traits\TArrayTools;
 use OCA\Files_Sharing\External\Storage as ExternalStorage;
+use OCP\DB\Exception;
 use OCP\Federation\ICloudIdManager;
 use OCP\Files\Config\IMountProvider;
 use OCP\Files\Folder;
@@ -77,7 +76,7 @@ public function getMountsForUser(IUser $user, IStorageFactory $loader): array {
 			try {
 				$this->fixDuplicateFile($user->getUID(), $item);
 				$mounts[] = $this->generateCircleMount($item, $loader);
-			} catch (Exception $e) {
+			} catch (\Exception $e) {
 				$this->logger->warning('issue with teams\' mounts', ['exception' => $e]);
 			}
 		}
@@ -204,9 +203,9 @@ private function fixDuplicateFile(string $userId, Mount $mount): void {
 			try {
 				$this->mountPointRequest->insert($mountPoint);
 				return;
-			} catch (DbalException $e) {
+			} catch (Exception $e) {
 				// meaning a duplicate mountpoint already exists, we need to set a new filename
-				if ($e->getReason() !== DbalException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+				if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
 					throw $e;
 				}
 			}
@@ -237,9 +236,9 @@ private function generateIncrementedMountpoint(Folder $fs, Mount $mount, IFedera
 						$this->mountPointRequest->insert($mountPoint);
 					}
 					return;
-				} catch (DbalException $e) {
+				} catch (Exception $e) {
 					// meaning path is already used by another share for this user, we keep incrementing
-					if ($e->getReason() !== DbalException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+					if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
 						throw $e;
 					}
 				}

psalm.xml

@@ -40,7 +40,6 @@
 		<file name="tests/stubs/oc_core_command_base.php" />
 		<file name="tests/stubs/oc_db_connection.php" />
 		<file name="tests/stubs/oc_db_connectionadapter.php" />
-		<file name="tests/stubs/oc_db_exceptions_dbalexception.php" />
 		<file name="tests/stubs/oc_db_querybuilder_querybuilder.php" />
 		<file name="tests/stubs/oc_db_schemawrapper.php" />
 		<file name="tests/stubs/oc_files_cache_cache.php" />

tests/stubs/oc_db_connectionadapter.php

@@ -11,7 +11,6 @@
 use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\Schema;
-use OC\DB\Exceptions\DbalException;
 use OC\DB\QueryBuilder\Sharded\CrossShardMoveHelper;
 use OC\DB\QueryBuilder\Sharded\ShardDefinition;
 use OCP\DB\IPreparedStatement;

tests/stubs/oc_db_querybuilder_querybuilder.php

@@ -9,7 +9,6 @@
 
 use Doctrine\DBAL\Query\QueryException;
 use OC\DB\ConnectionAdapter;
-use OC\DB\Exceptions\DbalException;
 use OC\DB\QueryBuilder\ExpressionBuilder\MySqlExpressionBuilder;
 use OC\DB\QueryBuilder\ExpressionBuilder\OCIExpressionBuilder;
 use OC\DB\QueryBuilder\ExpressionBuilder\PgSqlExpressionBuilder;

tests/stubs/oc_files_cache_cache.php

@@ -8,7 +8,6 @@
 namespace OC\Files\Cache;
 
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
-use OC\DB\Exceptions\DbalException;
 use OC\DB\QueryBuilder\Sharded\ShardDefinition;
 use OC\Files\Search\SearchComparison;
 use OC\Files\Search\SearchQuery;