fixup! feat(IUserFolder): add a user folder class

Signed-off-by: Côme Chilliet <[email protected]>

Author: come-nc

lib/private/Files/Node/Root.php

@@ -22,6 +22,7 @@
 use OCP\Files\Config\IUserMountCache;
 use OCP\Files\Events\Node\FilesystemTornDownEvent;
 use OCP\Files\IRootFolder;
+use OCP\Files\IUserFolder;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Node as INode;
 use OCP\Files\NotFoundException;
@@ -319,12 +320,10 @@ public function getName() {
 	/**
 	 * Returns a view to user's files folder
 	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\IUserFolder
 	 * @throws NoUserException
 	 * @throws NotPermittedException
 	 */
-	public function getUserFolder($userId) {
+	public function getUserFolder(string $userId): IUserFolder {
 		$userObject = $this->userManager->get($userId);
 
 		if (is_null($userObject)) {

lib/public/Files/IRootFolder.php

@@ -1,14 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+
 namespace OCP\Files;
 
 use OC\Hooks\Emitter;
 use OC\User\NoUserException;
+use OCP\AppFramework\Attribute\Consumable;
 use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Node as INode;
@@ -18,6 +22,7 @@
  *
  * @since 8.0.0
  */
+#[Consumable(since: '8.0.0')]
 interface IRootFolder extends Folder, Emitter {
 	/**
 	 * Returns a view to user's files folder
@@ -28,9 +33,9 @@ interface IRootFolder extends Folder, Emitter {
 	 * @throws NotPermittedException
 	 *
 	 * @since 8.2.0
-	 * @since 32.0.0 returns OCP\Files\IUserFolder instead of OCP\Files\Folder
+	 * @since 33.0.0 returns OCP\Files\IUserFolder instead of OCP\Files\Folder
 	 */
-	public function getUserFolder($userId);
+	public function getUserFolder(string $userId): IUserFolder;
 
 	/**
 	 * Get a file or folder by fileid, inside a parent path

lib/public/Files/IUserFolder.php

@@ -1,21 +1,26 @@
 <?php
 
 declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCP\Files;
 
+use OCP\AppFramework\Attribute\Consumable;
+
 /**
- * @since 32.0.0
+ * @since 33.0.0
  */
+#[Consumable(since: '33.0.0')]
 interface IUserFolder extends Folder {
 
 	/**
 	 * @param bool $useCache - Use the cached value if available instead of recalculate.
 	 * @return array{used: int|float, free: int|float, total: int|float, quota: int|float}
-	 * @since 32.0.0
+	 * @since 33.0.0
 	 */
 	public function getUserQuota(bool $useCache = true): array;