1 files changed, 25 insertions, 26 deletions

diff --git a/lib/private/Files/Config/LazyStorageMountInfo.php b/lib/private/Files/Config/LazyStorageMountInfo.php
index 8d183d44e84..eb2c60dfa46 100644
--- a/lib/private/Files/Config/LazyStorageMountInfo.php
+++ b/lib/private/Files/Config/LazyStorageMountInfo.php
@@ -1,33 +1,17 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Robin Appelman <robin@icewind.nl>
- *
- * @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 OCP\Files\Mount\IMountPoint;
 use OCP\IUser;
 
 class LazyStorageMountInfo extends CachedMountInfo {
-	/** @var IMountPoint */
-	private $mount;
+	private IMountPoint $mount;
 
 	/**
 	 * CachedMountInfo constructor.
@@ -38,12 +22,16 @@ class LazyStorageMountInfo extends CachedMountInfo {
 	public function __construct(IUser $user, IMountPoint $mount) {
 		$this->user = $user;
 		$this->mount = $mount;
+		$this->rootId = 0;
+		$this->storageId = 0;
+		$this->mountPoint = '';
+		$this->key = '';
 	}
 
 	/**
 	 * @return int the numeric storage id of the mount
 	 */
-	public function getStorageId() {
+	public function getStorageId(): int {
 		if (!$this->storageId) {
 			$this->storageId = $this->mount->getNumericStorageId();
 		}
@@ -53,7 +41,7 @@ class LazyStorageMountInfo extends CachedMountInfo {
 	/**
 	 * @return int the fileid of the root of the mount
 	 */
-	public function getRootId() {
+	public function getRootId(): int {
 		if (!$this->rootId) {
 			$this->rootId = $this->mount->getStorageRootId();
 		}
@@ -63,14 +51,14 @@ class LazyStorageMountInfo extends CachedMountInfo {
 	/**
 	 * @return string the mount point of the mount for the user
 	 */
-	public function getMountPoint() {
+	public function getMountPoint(): string {
 		if (!$this->mountPoint) {
 			$this->mountPoint = $this->mount->getMountPoint();
 		}
 		return parent::getMountPoint();
 	}
 
-	public function getMountId() {
+	public function getMountId(): ?int {
 		return $this->mount->getMountId();
 	}
 
@@ -79,7 +67,18 @@ class LazyStorageMountInfo extends CachedMountInfo {
 	 *
 	 * @return string
 	 */
-	public function getRootInternalPath() {
+	public function getRootInternalPath(): string {
 		return $this->mount->getInternalPath($this->mount->getMountPoint());
 	}
+
+	public function getMountProvider(): string {
+		return $this->mount->getMountProvider();
+	}
+
+	public function getKey(): string {
+		if (!$this->key) {
+			$this->key = $this->getRootId() . '::' . $this->getMountPoint();
+		}
+		return $this->key;
+	}
 }