refactor: declare getMount() and getMountsIn() at IRootFolder

Signed-off-by: Arthur Schiwon <[email protected]>
nextcloud · Jun 15, 2023 · ff23772 · ff23772
1 parent b871ef6
commit ff23772
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php
@@ -199,12 +199,8 @@ public function searchInCaches(ISearchQuery $searchQuery, array $caches): array
 	 */
 	public function getCachesAndMountPointsForSearch(IRootFolder $root, string $path, bool $limitToHome = false): array {
 		$rootLength = strlen($path);
-		$storage = null;
-		if (method_exists($root, 'getMount')) {
-			/** @var IMountPoint $mount */
-			$mount = $root->getMount($path);
-			$storage = $mount->getStorage();
-		}
+		$mount = $root->getMount($path);
+		$storage = $mount->getStorage();
 		if ($storage === null) {
 			return [];
 		}
@@ -221,8 +217,7 @@ public function getCachesAndMountPointsForSearch(IRootFolder $root, string $path
 		/** @var IMountPoint[] $mountByMountPoint */
 		$mountByMountPoint = ['' => $mount];
 
-		if (!$limitToHome && method_exists($root, 'getMountsIn')) {
-			/** @var IMountPoint[] $mounts */
+		if (!$limitToHome) {
 			$mounts = $root->getMountsIn($path);
 			foreach ($mounts as $mount) {
 				$storage = $mount->getStorage();

diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php
@@ -330,12 +330,8 @@ protected function getAppDataDirectoryName(): string {
 	 * @return array
 	 */
 	protected function getByIdInRootMount(int $id): array {
-		$storage = null;
-		if (\method_exists($this->root, 'getMount')) {
-			/** @var IMountPoint $mount */
-			$mount = $this->root->getMount('');
-			$storage = $mount->getStorage();
-		}
+		$mount = $this->root->getMount('');
+		$storage = $mount->getStorage();
 		$cacheEntry = $storage?->getCache($this->path)->get($id);
 		if (!$cacheEntry) {
 			return [];

diff --git a/lib/private/Files/Node/LazyFolder.php b/lib/private/Files/Node/LazyFolder.php
@@ -29,6 +29,7 @@
 use OC\Files\Utils\PathHelper;
 use OCP\Files\Folder;
 use OCP\Constants;
+use OCP\Files\Mount\IMountPoint;
 
 /**
  * Class LazyFolder
@@ -111,14 +112,14 @@ public function mount($storage, $mountPoint, $arguments = []) {
 	/**
 	 * @inheritDoc
 	 */
-	public function getMount($mountPoint) {
+	public function getMount(string $mountPoint): IMountPoint {
 		return $this->__call(__FUNCTION__, func_get_args());
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function getMountsIn($mountPoint) {
+	public function getMountsIn(string $mountPoint): array {
 		return $this->__call(__FUNCTION__, func_get_args());
 	}
 

diff --git a/lib/private/Files/Node/Root.php b/lib/private/Files/Node/Root.php
@@ -154,19 +154,15 @@ public function mount($storage, $mountPoint, $arguments = []) {
 		$this->mountManager->addMount($mount);
 	}
 
-	/**
-	 * @param string $mountPoint
-	 * @return \OC\Files\Mount\MountPoint
-	 */
-	public function getMount($mountPoint) {
+	public function getMount(string $mountPoint): IMountPoint {
 		return $this->mountManager->find($mountPoint);
 	}
 
 	/**
 	 * @param string $mountPoint
 	 * @return \OC\Files\Mount\MountPoint[]
 	 */
-	public function getMountsIn($mountPoint) {
+	public function getMountsIn(string $mountPoint): array {
 		return $this->mountManager->findIn($mountPoint);
 	}
 

diff --git a/lib/public/Files/IRootFolder.php b/lib/public/Files/IRootFolder.php
@@ -26,6 +26,7 @@
 
 use OC\Hooks\Emitter;
 use OC\User\NoUserException;
+use OCP\Files\Mount\IMountPoint;
 
 /**
  * Interface IRootFolder
@@ -55,4 +56,16 @@ public function getUserFolder($userId);
 	 * @since 24.0.0
 	 */
 	public function getByIdInPath(int $id, string $path);
+
+	/**
+	 * @return IMountPoint[]
+	 *
+	 * @since 28.0.0
+	 */
+	public function getMountsIn(string $mountPoint): array;
+
+	/**
+	 * @since 28.0.0
+	 */
+	public function getMount(string $mountPoint): IMountPoint;
 }