1 files changed, 43 insertions, 64 deletions

diff --git a/lib/private/Files/Config/CachedMountInfo.php b/lib/private/Files/Config/CachedMountInfo.php
index 38919020ee4..79dd6c6ea1d 100644
--- a/lib/private/Files/Config/CachedMountInfo.php
+++ b/lib/private/Files/Config/CachedMountInfo.php
@@ -1,26 +1,10 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Robin Appelman <robin@icewind.nl>
- * @author Semih Serhat Karakaya <karakayasemi@itu.edu.tr>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OC\Files\Config;
 
 use OC\Files\Filesystem;
@@ -29,35 +13,14 @@ use OCP\Files\Node;
 use OCP\IUser;
 
 class CachedMountInfo implements ICachedMountInfo {
-	/**
-	 * @var IUser
-	 */
-	protected $user;
-
-	/**
-	 * @var int
-	 */
-	protected $storageId;
-
-	/**
-	 * @var int
-	 */
-	protected $rootId;
-
-	/**
-	 * @var string
-	 */
-	protected $mountPoint;
-
-	/**
-	 * @var int|null
-	 */
-	protected $mountId;
-
-	/**
-	 * @var string
-	 */
-	protected $rootInternalPath;
+	protected IUser $user;
+	protected int $storageId;
+	protected int $rootId;
+	protected string $mountPoint;
+	protected ?int $mountId;
+	protected string $rootInternalPath;
+	protected string $mountProvider;
+	protected string $key;
 
 	/**
 	 * CachedMountInfo constructor.
@@ -69,55 +32,63 @@ class CachedMountInfo implements ICachedMountInfo {
 	 * @param int|null $mountId
 	 * @param string $rootInternalPath
 	 */
-	public function __construct(IUser $user, $storageId, $rootId, $mountPoint, $mountId = null, $rootInternalPath = '') {
+	public function __construct(
+		IUser $user,
+		int $storageId,
+		int $rootId,
+		string $mountPoint,
+		string $mountProvider,
+		?int $mountId = null,
+		string $rootInternalPath = '',
+	) {
 		$this->user = $user;
 		$this->storageId = $storageId;
 		$this->rootId = $rootId;
 		$this->mountPoint = $mountPoint;
 		$this->mountId = $mountId;
 		$this->rootInternalPath = $rootInternalPath;
+		if (strlen($mountProvider) > 128) {
+			throw new \Exception("Mount provider $mountProvider name exceeds the limit of 128 characters");
+		}
+		$this->mountProvider = $mountProvider;
+		$this->key = $rootId . '::' . $mountPoint;
 	}
 
 	/**
 	 * @return IUser
 	 */
-	public function getUser() {
+	public function getUser(): IUser {
 		return $this->user;
 	}
 
 	/**
 	 * @return int the numeric storage id of the mount
 	 */
-	public function getStorageId() {
+	public function getStorageId(): int {
 		return $this->storageId;
 	}
 
 	/**
 	 * @return int the fileid of the root of the mount
 	 */
-	public function getRootId() {
+	public function getRootId(): int {
 		return $this->rootId;
 	}
 
 	/**
-	 * @return Node the root node of the mount
+	 * @return Node|null the root node of the mount
 	 */
-	public function getMountPointNode() {
+	public function getMountPointNode(): ?Node {
 		// TODO injection etc
 		Filesystem::initMountPoints($this->getUser()->getUID());
 		$userNode = \OC::$server->getUserFolder($this->getUser()->getUID());
-		$nodes = $userNode->getParent()->getById($this->getRootId());
-		if (count($nodes) > 0) {
-			return $nodes[0];
-		} else {
-			return null;
-		}
+		return $userNode->getParent()->getFirstNodeById($this->getRootId());
 	}
 
 	/**
 	 * @return string the mount point of the mount for the user
 	 */
-	public function getMountPoint() {
+	public function getMountPoint(): string {
 		return $this->mountPoint;
 	}
 
@@ -127,7 +98,7 @@ class CachedMountInfo implements ICachedMountInfo {
 	 * @return int|null mount id or null if not applicable
 	 * @since 9.1.0
 	 */
-	public function getMountId() {
+	public function getMountId(): ?int {
 		return $this->mountId;
 	}
 
@@ -136,7 +107,15 @@ class CachedMountInfo implements ICachedMountInfo {
 	 *
 	 * @return string
 	 */
-	public function getRootInternalPath() {
+	public function getRootInternalPath(): string {
 		return $this->rootInternalPath;
 	}
+
+	public function getMountProvider(): string {
+		return $this->mountProvider;
+	}
+
+	public function getKey(): string {
+		return $this->key;
+	}
 }