2 files changed, 38 insertions, 34 deletions

diff --git a/apps/files_sharing/lib/ShareBackend/File.php b/apps/files_sharing/lib/ShareBackend/File.php
index 93f98c9e18a..2aa52ef1b7f 100644
--- a/apps/files_sharing/lib/ShareBackend/File.php
+++ b/apps/files_sharing/lib/ShareBackend/File.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -6,11 +7,18 @@
  */
 namespace OCA\Files_Sharing\ShareBackend;
 
+use OC\Files\Filesystem;
+use OC\Files\View;
 use OCA\FederatedFileSharing\FederatedShareProvider;
+use OCA\Files_Sharing\Helper;
+use OCP\Files\NotFoundException;
+use OCP\IDBConnection;
+use OCP\Server;
 use OCP\Share\IShare;
+use OCP\Share_Backend_File_Dependent;
 use Psr\Log\LoggerInterface;
 
-class File implements \OCP\Share_Backend_File_Dependent {
+class File implements Share_Backend_File_Dependent {
 	public const FORMAT_SHARED_STORAGE = 0;
 	public const FORMAT_GET_FOLDER_CONTENTS = 1;
 	public const FORMAT_FILE_APP_ROOT = 2;
@@ -21,26 +29,25 @@ class File implements \OCP\Share_Backend_File_Dependent {
 
 	private $path;
 
-	/** @var FederatedShareProvider */
-	private $federatedShareProvider;
-
-	public function __construct(?FederatedShareProvider $federatedShareProvider = null) {
+	public function __construct(
+		private ?FederatedShareProvider $federatedShareProvider = null,
+	) {
 		if ($federatedShareProvider) {
 			$this->federatedShareProvider = $federatedShareProvider;
 		} else {
-			$this->federatedShareProvider = \OC::$server->query(FederatedShareProvider::class);
+			$this->federatedShareProvider = Server::get(FederatedShareProvider::class);
 		}
 	}
 
 	public function isValidSource($itemSource, $uidOwner) {
 		try {
-			$path = \OC\Files\Filesystem::getPath($itemSource);
+			$path = Filesystem::getPath($itemSource);
 			// FIXME: attributes should not be set here,
 			// keeping this pattern for now to avoid unexpected
 			// regressions
-			$this->path = \OC\Files\Filesystem::normalizePath(basename($path));
+			$this->path = Filesystem::normalizePath(basename($path));
 			return true;
-		} catch (\OCP\Files\NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			return false;
 		}
 	}
@@ -52,9 +59,9 @@ class File implements \OCP\Share_Backend_File_Dependent {
 			return $path;
 		} else {
 			try {
-				$path = \OC\Files\Filesystem::getPath($itemSource);
+				$path = Filesystem::getPath($itemSource);
 				return $path;
-			} catch (\OCP\Files\NotFoundException $e) {
+			} catch (NotFoundException $e) {
 				return false;
 			}
 		}
@@ -65,20 +72,14 @@ class File implements \OCP\Share_Backend_File_Dependent {
 	 *
 	 * @param string $itemSource
 	 * @param string $shareWith
-	 * @param array $exclude (optional)
 	 * @return string
 	 */
-	public function generateTarget($itemSource, $shareWith, $exclude = null) {
-		$shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
-		$target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($itemSource));
+	public function generateTarget($itemSource, $shareWith) {
+		$shareFolder = Helper::getShareFolder();
+		$target = Filesystem::normalizePath($shareFolder . '/' . basename($itemSource));
 
-		// for group shares we return the target right away
-		if ($shareWith === false) {
-			return $target;
-		}
-
-		\OC\Files\Filesystem::initMountPoints($shareWith);
-		$view = new \OC\Files\View('/' . $shareWith . '/files');
+		Filesystem::initMountPoints($shareWith);
+		$view = new View('/' . $shareWith . '/files');
 
 		if (!$view->is_dir($shareFolder)) {
 			$dir = '';
@@ -91,9 +92,7 @@ class File implements \OCP\Share_Backend_File_Dependent {
 			}
 		}
 
-		$excludeList = is_array($exclude) ? $exclude : [];
-
-		return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view);
+		return Helper::generateUniqueTarget($target, $view);
 	}
 
 	public function formatItems($items, $format, $parameters = null) {
@@ -124,7 +123,7 @@ class File implements \OCP\Share_Backend_File_Dependent {
 				$file['uid_owner'] = $item['uid_owner'];
 				$file['displayname_owner'] = $item['displayname_owner'];
 
-				$storage = \OC\Files\Filesystem::getStorage('/');
+				$storage = Filesystem::getStorage('/');
 				$cache = $storage->getCache();
 				$file['size'] = $item['size'];
 				$files[] = $file;
@@ -185,13 +184,13 @@ class File implements \OCP\Share_Backend_File_Dependent {
 		if (isset($source['parent'])) {
 			$parent = $source['parent'];
 			while (isset($parent)) {
-				$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+				$qb = Server::get(IDBConnection::class)->getQueryBuilder();
 				$qb->select('parent', 'uid_owner')
 					->from('share')
 					->where(
 						$qb->expr()->eq('id', $qb->createNamedParameter($parent))
 					);
-				$result = $qb->execute();
+				$result = $qb->executeQuery();
 				$item = $result->fetch();
 				$result->closeCursor();
 				if (isset($item['parent'])) {
@@ -207,7 +206,7 @@ class File implements \OCP\Share_Backend_File_Dependent {
 		if (isset($fileOwner)) {
 			$source['fileOwner'] = $fileOwner;
 		} else {
-			\OCP\Server::get(LoggerInterface::class)->error('No owner found for reshare', ['app' => 'files_sharing']);
+			Server::get(LoggerInterface::class)->error('No owner found for reshare', ['app' => 'files_sharing']);
 		}
 
 		return $source;
diff --git a/apps/files_sharing/lib/ShareBackend/Folder.php b/apps/files_sharing/lib/ShareBackend/Folder.php
index 9908381ef1e..df5529c3c4a 100644
--- a/apps/files_sharing/lib/ShareBackend/Folder.php
+++ b/apps/files_sharing/lib/ShareBackend/Folder.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -6,12 +7,16 @@
  */
 namespace OCA\Files_Sharing\ShareBackend;
 
-class Folder extends File implements \OCP\Share_Backend_Collection {
+use OCP\IDBConnection;
+use OCP\Server;
+use OCP\Share_Backend_Collection;
+
+class Folder extends File implements Share_Backend_Collection {
 	public function getChildren($itemSource) {
 		$children = [];
 		$parents = [$itemSource];
 
-		$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$qb = Server::get(IDBConnection::class)->getQueryBuilder();
 		$qb->select('id')
 			->from('mimetypes')
 			->where(
@@ -22,12 +27,12 @@ class Folder extends File implements \OCP\Share_Backend_Collection {
 		$result->closeCursor();
 
 		if ($row = $result->fetchRow()) {
-			$mimetype = (int) $row['id'];
+			$mimetype = (int)$row['id'];
 		} else {
 			$mimetype = -1;
 		}
 		while (!empty($parents)) {
-			$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+			$qb = Server::get(IDBConnection::class)->getQueryBuilder();
 
 			$parents = array_map(function ($parent) use ($qb) {
 				return $qb->createNamedParameter($parent);
@@ -45,7 +50,7 @@ class Folder extends File implements \OCP\Share_Backend_Collection {
 			while ($file = $result->fetch()) {
 				$children[] = ['source' => $file['fileid'], 'file_path' => $file['name']];
 				// If a child folder is found look inside it
-				if ((int) $file['mimetype'] === $mimetype) {
+				if ((int)$file['mimetype'] === $mimetype) {
 					$parents[] = $file['fileid'];
 				}
 			}