9 files changed, 129 insertions, 4 deletions
diff --git a/lib/public/Files/Config/Event/UserMountAddedEvent.php b/lib/public/Files/Config/Event/UserMountAddedEvent.php
new file mode 100644
index 00000000000..8abd7512188
--- /dev/null
+++ b/lib/public/Files/Config/Event/UserMountAddedEvent.php
@@ -0,0 +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\Config\Event;
+
+use OCP\EventDispatcher\Event;
+use OCP\Files\Config\ICachedMountInfo;
+
+/**
+ * Event emitted when a user mount was added.
+ *
+ * @since 32.0.0
+ */
+class UserMountAddedEvent extends Event {
+	public function __construct(
+		public readonly ICachedMountInfo $mountPoint,
+	) {
+		parent::__construct();
+	}
+}
diff --git a/lib/public/Files/Config/Event/UserMountRemovedEvent.php b/lib/public/Files/Config/Event/UserMountRemovedEvent.php
new file mode 100644
index 00000000000..0de7cfc4a99
--- /dev/null
+++ b/lib/public/Files/Config/Event/UserMountRemovedEvent.php
@@ -0,0 +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\Config\Event;
+
+use OCP\EventDispatcher\Event;
+use OCP\Files\Config\ICachedMountInfo;
+
+/**
+ * Event emitted when a user mount was removed.
+ *
+ * @since 32.0.0
+ */
+class UserMountRemovedEvent extends Event {
+	public function __construct(
+		public readonly ICachedMountInfo $mountPoint,
+	) {
+		parent::__construct();
+	}
+}
diff --git a/lib/public/Files/Config/Event/UserMountUpdatedEvent.php b/lib/public/Files/Config/Event/UserMountUpdatedEvent.php
new file mode 100644
index 00000000000..f797bef134e
--- /dev/null
+++ b/lib/public/Files/Config/Event/UserMountUpdatedEvent.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCP\Files\Config\Event;
+
+use OCP\EventDispatcher\Event;
+use OCP\Files\Config\ICachedMountInfo;
+
+/**
+ * Event emitted when a user mount was moved.
+ *
+ * @since 32.0.0
+ */
+class UserMountUpdatedEvent extends Event {
+	public function __construct(
+		public readonly ICachedMountInfo $oldMountPoint,
+		public readonly ICachedMountInfo $newMountPoint,
+	) {
+		parent::__construct();
+	}
+}
diff --git a/lib/public/Files/Folder.php b/lib/public/Files/Folder.php
index 3128a17c10c..a35d2d78bc9 100644
--- a/lib/public/Files/Folder.php
+++ b/lib/public/Files/Folder.php
@@ -199,4 +199,15 @@ interface Folder extends Node {
 	 * @since 9.1.0
 	 */
 	public function getRecent($limit, $offset = 0);
+
+	/**
+	 * Verify if the given path is valid and allowed from this folder.
+	 *
+	 * @param string $path the path from this folder
+	 * @param string $fileName
+	 * @param bool $readonly Check only if the path is allowed for read-only access
+	 * @throws InvalidPathException
+	 * @since 32.0.0
+	 */
+	public function verifyPath($fileName, $readonly = false): void;
 }
diff --git a/lib/public/Files/IFilenameValidator.php b/lib/public/Files/IFilenameValidator.php
index d8bd06d179d..9b7fa1e2e2e 100644
--- a/lib/public/Files/IFilenameValidator.php
+++ b/lib/public/Files/IFilenameValidator.php
@@ -43,7 +43,7 @@ interface IFilenameValidator {
 	 * If no sanitizing is needed the same name is returned.
 	 *
 	 * @param string $name The filename to sanitize
-	 * @param null|string $charReplacement Character to use for replacing forbidden ones - by default space, dash or underscore is used if allowed.
+	 * @param null|string $charReplacement Character to use for replacing forbidden ones - by default underscore, dash or space is used if allowed.
 	 * @throws \InvalidArgumentException if no character replacement was given (and the default could not be applied) or the replacement is not valid.
 	 * @since 32.0.0
 	 */
diff --git a/lib/public/Files/IMimeTypeDetector.php b/lib/public/Files/IMimeTypeDetector.php
index 1bc9c514610..1e87cf932ce 100644
--- a/lib/public/Files/IMimeTypeDetector.php
+++ b/lib/public/Files/IMimeTypeDetector.php
@@ -87,4 +87,12 @@ interface IMimeTypeDetector {
 	 * @since 32.0.0
 	 */
 	public function getAllMappings(): array;
+
+	/**
+	 * Get all human readable mime names
+	 *
+	 * @return array<string,string>
+	 * @since 32.0.0
+	 */
+	public function getAllNamings(): array;
 }
diff --git a/lib/public/Files/SimpleFS/ISimpleFile.php b/lib/public/Files/SimpleFS/ISimpleFile.php
index 2682c22580d..10cdc0a919d 100644
--- a/lib/public/Files/SimpleFS/ISimpleFile.php
+++ b/lib/public/Files/SimpleFS/ISimpleFile.php
@@ -5,8 +5,10 @@
  */
 namespace OCP\Files\SimpleFS;
 
+use OCP\Files\GenericFileException;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
+use OCP\Lock\LockedException;
 
 /**
  * This interface allows to manage simple files.
@@ -49,8 +51,10 @@ interface ISimpleFile {
 	/**
 	 * Get the content
 	 *
-	 * @throws NotPermittedException
+	 * @throws GenericFileException
+	 * @throws LockedException
 	 * @throws NotFoundException
+	 * @throws NotPermittedException
 	 * @since 11.0.0
 	 */
 	public function getContent(): string;
@@ -59,8 +63,10 @@ interface ISimpleFile {
 	 * Overwrite the file
 	 *
 	 * @param string|resource $data
-	 * @throws NotPermittedException
+	 * @throws GenericFileException
+	 * @throws LockedException
 	 * @throws NotFoundException
+	 * @throws NotPermittedException
 	 * @since 11.0.0
 	 */
 	public function putContent($data): void;
diff --git a/lib/public/Files/Template/BeforeGetTemplatesEvent.php b/lib/public/Files/Template/BeforeGetTemplatesEvent.php
index 006163c5f7f..9fb7453a50c 100644
--- a/lib/public/Files/Template/BeforeGetTemplatesEvent.php
+++ b/lib/public/Files/Template/BeforeGetTemplatesEvent.php
@@ -17,16 +17,19 @@ use OCP\EventDispatcher\Event;
 class BeforeGetTemplatesEvent extends Event {
 	/** @var array<Template> */
 	private array $templates;
+	/** @var bool */
+	private bool $withFields;
 
 	/**
 	 * @param array<Template> $templates
 	 *
 	 * @since 30.0.0
 	 */
-	public function __construct(array $templates) {
+	public function __construct(array $templates, bool $withFields = false) {
 		parent::__construct();
 
 		$this->templates = $templates;
+		$this->withFields = $withFields;
 	}
 
 	/**
@@ -37,4 +40,13 @@ class BeforeGetTemplatesEvent extends Event {
 	public function getTemplates(): array {
 		return $this->templates;
 	}
+
+	/**
+	 * @return bool
+	 *
+	 * @since 32.0.0
+	 */
+	public function shouldGetFields(): bool {
+		return $this->withFields;
+	}
 }
diff --git a/lib/public/Files/Template/ITemplateManager.php b/lib/public/Files/Template/ITemplateManager.php
index 9a81aa51ceb..df81bc5604e 100644
--- a/lib/public/Files/Template/ITemplateManager.php
+++ b/lib/public/Files/Template/ITemplateManager.php
@@ -39,6 +39,15 @@ interface ITemplateManager {
 	public function listTemplates(): array;
 
 	/**
+	 * Get the fields for a given template
+	 *
+	 * @param int $fileId
+	 * @return array
+	 * @since 32.0.0
+	 */
+	public function listTemplateFields(int $fileId): array;
+
+	/**
 	 * @return bool
 	 * @since 21.0.0
 	 */