Move TemplateProvider registration to boot context and make template type registration lazy

Signed-off-by: Julius Härtl <jus@bitgrid.net>

2 files changed, 7 insertions, 8 deletions

diff --git a/lib/public/Files/Template/CreatedFromTemplateEvent.php b/lib/public/Files/Template/FileCreatedFromTemplateEvent.php
index 8d802814406..7ed342e4007 100644
--- a/lib/public/Files/Template/CreatedFromTemplateEvent.php
+++ b/lib/public/Files/Template/FileCreatedFromTemplateEvent.php
@@ -32,7 +32,7 @@ use OCP\Files\File;
 /**
  * @since 21.0.0
  */
-class CreatedFromTemplateEvent extends Event {
+class FileCreatedFromTemplateEvent extends Event {
 	private $template;
 	private $target;
 
diff --git a/lib/public/Files/Template/ITemplateManager.php b/lib/public/Files/Template/ITemplateManager.php
index 58b5b6c4846..39a48598508 100644
--- a/lib/public/Files/Template/ITemplateManager.php
+++ b/lib/public/Files/Template/ITemplateManager.php
@@ -36,19 +36,18 @@ interface ITemplateManager {
 	/**
 	 * Register a template type support
 	 *
-	 * @param TemplateFileCreator $templateType
+	 * @param callable(): TemplateFileCreator $callback A callback which returns the TemplateFileCreator instance to register
 	 * @since 21.0.0
 	 */
-	public function registerTemplateFileCreator(TemplateFileCreator $templateType): void;
+	public function registerTemplateFileCreator(callable $callback): void;
 
 	/**
-	 * Register a custom template provider class that is able to inject custom templates
-	 * in addition to the user defined ones
+	 * Get a list of available file creators
 	 *
-	 * @param string $providerClass
+	 * @return array
 	 * @since 21.0.0
 	 */
-	public function registerTemplateProvider(string $providerClass): void;
+	public function listCreators(): array;
 
 	/**
 	 * Get a list of available file creators and their offered templates
@@ -56,7 +55,7 @@ interface ITemplateManager {
 	 * @return array
 	 * @since 21.0.0
 	 */
-	public function listCreators():? array;
+	public function listTemplates(): array;
 
 	/**
 	 * @return bool