fix: psalm

nextcloud · Oct 17, 2024 · bca87e5 · bca87e5
1 parent 955aa2e
commit bca87e5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/apps/dav/lib/CalDAV/Reminder/Backend.php b/apps/dav/lib/CalDAV/Reminder/Backend.php
@@ -26,7 +26,7 @@ class Backend {
 	 */
 	public function __construct(
 		protected IDBConnection $db,
-		protectedITimeFactory $timeFactory,
+		protected ITimeFactory $timeFactory,
 	) {
 	}
 

diff --git a/apps/files_sharing/lib/ShareBackend/File.php b/apps/files_sharing/lib/ShareBackend/File.php
@@ -10,9 +10,7 @@
 use OC\Files\View;
 use OCA\FederatedFileSharing\FederatedShareProvider;
 use OCA\Files_Sharing\Helper;
-use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\Files\NotFoundException;
-use OCP\IDBConnection;
 use OCP\Server;
 use OCP\Share\IShare;
 use OCP\Share_Backend_File_Dependent;
@@ -29,10 +27,7 @@ class File implements Share_Backend_File_Dependent {
 
 	private $path;
 
-	public function __construct(
-		private ?FederatedShareProvider $federatedShareProvider = null,
-		protected IDBConnection $connection,
-	) {
+	public function __construct(private ?FederatedShareProvider $federatedShareProvider = null) {
 		if ($federatedShareProvider) {
 			$this->federatedShareProvider = $federatedShareProvider;
 		} else {
@@ -185,7 +180,7 @@ protected static function resolveReshares($source) {
 		if (isset($source['parent'])) {
 			$parent = $source['parent'];
 			while (isset($parent)) {
-				$qb = $this->connection->getQueryBuilder();
+				$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 				$qb->select('parent', 'uid_owner')
 					->from('share')
 					->where(

diff --git a/lib/private/Files/Cache/Storage.php b/lib/private/Files/Cache/Storage.php
@@ -44,11 +44,7 @@ public static function getGlobalCache() {
 	 * @param bool $isAvailable
 	 * @throws \RuntimeException
 	 */
-	public function __construct(
-		$storage,
-		$isAvailable,
-		protected IDBConnection $connection,
-	) {
+	public function __construct($storage, $isAvailable, IDBConnection $connection) {
 		if ($storage instanceof IStorage) {
 			$this->storageId = $storage->getId();
 		} else {
@@ -156,12 +152,12 @@ public function setAvailability($isAvailable, int $delay = 0) {
 			\OCP\Server::get(LoggerInterface::class)->info('Storage with ' . $this->storageId . ' marked as unavailable', ['app' => 'lib']);
 		}
 
-		$query = $this->connection->getQueryBuilder();
+		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 		$query->update('storages')
 			->set('available', $query->createNamedParameter($available))
 			->set('last_checked', $query->createNamedParameter(time() + $delay))
 			->where($query->expr()->eq('id', $query->createNamedParameter($this->storageId)));
-		$query->executeStatement();
+		$query->executeQuery();
 	}
 
 	/**
@@ -183,13 +179,13 @@ public static function remove($storageId) {
 		$storageId = self::adjustStorageId($storageId);
 		$numericId = self::getNumericStorageId($storageId);
 
-		$query = $this->connection->getQueryBuilder();
+		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 		$query->delete('storages')
 			->where($query->expr()->eq('id', $query->createNamedParameter($storageId)));
 		$query->executeStatement();
 
 		if (!is_null($numericId)) {
-			$query = $this->connection->getQueryBuilder();
+			$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 			$query->delete('filecache')
 				->where($query->expr()->eq('storage', $query->createNamedParameter($numericId)));
 			$query->executeStatement();
@@ -202,10 +198,12 @@ public static function remove($storageId) {
 	 * @param int $mountId
 	 */
 	public static function cleanByMountId(int $mountId) {
+		$db = \OC::$server->getDatabaseConnection();
+
 		try {
-			$this->connection->beginTransaction();
+			$db->beginTransaction();
 
-			$query = $this->connection->getQueryBuilder();
+			$query = $db->getQueryBuilder();
 			$query->select('storage_id')
 				->from('mounts')
 				->where($query->expr()->eq('mount_id', $query->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
@@ -227,7 +225,7 @@ public static function cleanByMountId(int $mountId) {
 				->where($query->expr()->eq('mount_id', $query->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
 			$query->executeStatement();
 
-			$this->connection->commit();
+			$db->commit();
 		} catch (\Exception $e) {
 			$db->rollBack();
 			throw $e;