From 05ed5aa230fde4e2c9ccf9c18c1e8766dbc9ad8d Mon Sep 17 00:00:00 2001 From: Elizabeth Danzberger Date: Fri, 5 Jul 2024 12:47:01 -0400 Subject: [PATCH] fix: Emit new `BeforeGetTemplates` event Signed-off-by: Elizabeth Danzberger --- lib/composer/composer/autoload_classmap.php | 1 + lib/composer/composer/autoload_static.php | 1 + .../Files/Template/TemplateManager.php | 3 +++ .../Template/BeforeGetTemplatesEvent.php | 24 +++++++++++++++++++ lib/public/Files/Template/Field.php | 4 +--- lib/public/Files/Template/FieldType.php | 2 +- lib/public/Files/Template/Template.php | 2 -- 7 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 lib/public/Files/Template/BeforeGetTemplatesEvent.php diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 9244ce9003b..6d8f1578997 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -435,6 +435,7 @@ return array( 'OCP\\Files\\Storage\\IStorage' => $baseDir . '/lib/public/Files/Storage/IStorage.php', 'OCP\\Files\\Storage\\IStorageFactory' => $baseDir . '/lib/public/Files/Storage/IStorageFactory.php', 'OCP\\Files\\Storage\\IWriteStreamStorage' => $baseDir . '/lib/public/Files/Storage/IWriteStreamStorage.php', + 'OCP\\Files\\Template\\BeforeGetTemplatesEvent' => $baseDir . '/lib/public/Files/Template/BeforeGetTemplatesEvent.php', 'OCP\\Files\\Template\\Field' => $baseDir . '/lib/public/Files/Template/Field.php', 'OCP\\Files\\Template\\FieldType' => $baseDir . '/lib/public/Files/Template/FieldType.php', 'OCP\\Files\\Template\\FileCreatedFromTemplateEvent' => $baseDir . '/lib/public/Files/Template/FileCreatedFromTemplateEvent.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index c0931bc5940..769a6c300ca 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -468,6 +468,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\Files\\Storage\\IStorage' => __DIR__ . '/../../..' . '/lib/public/Files/Storage/IStorage.php', 'OCP\\Files\\Storage\\IStorageFactory' => __DIR__ . '/../../..' . '/lib/public/Files/Storage/IStorageFactory.php', 'OCP\\Files\\Storage\\IWriteStreamStorage' => __DIR__ . '/../../..' . '/lib/public/Files/Storage/IWriteStreamStorage.php', + 'OCP\\Files\\Template\\BeforeGetTemplatesEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Template/BeforeGetTemplatesEvent.php', 'OCP\\Files\\Template\\Field' => __DIR__ . '/../../..' . '/lib/public/Files/Template/Field.php', 'OCP\\Files\\Template\\FieldType' => __DIR__ . '/../../..' . '/lib/public/Files/Template/FieldType.php', 'OCP\\Files\\Template\\FileCreatedFromTemplateEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Template/FileCreatedFromTemplateEvent.php', diff --git a/lib/private/Files/Template/TemplateManager.php b/lib/private/Files/Template/TemplateManager.php index 8362298b831..e9014c7c17e 100644 --- a/lib/private/Files/Template/TemplateManager.php +++ b/lib/private/Files/Template/TemplateManager.php @@ -18,6 +18,7 @@ use OCP\Files\GenericFileException; use OCP\Files\IRootFolder; use OCP\Files\Node; use OCP\Files\NotFoundException; +use OCP\Files\Template\BeforeGetTemplatesEvent; use OCP\Files\Template\FileCreatedFromTemplateEvent; use OCP\Files\Template\ICustomTemplateProvider; use OCP\Files\Template\ITemplateManager; @@ -204,6 +205,8 @@ class TemplateManager implements ITemplateManager { } } + $this->eventDispatcher->dispatchTyped(new BeforeGetTemplatesEvent($templates)); + return $templates; } diff --git a/lib/public/Files/Template/BeforeGetTemplatesEvent.php b/lib/public/Files/Template/BeforeGetTemplatesEvent.php new file mode 100644 index 00000000000..dee4154b98d --- /dev/null +++ b/lib/public/Files/Template/BeforeGetTemplatesEvent.php @@ -0,0 +1,24 @@ +templates = $templates; + } + + public function getTemplates(): array { + return $this->templates; + } +} diff --git a/lib/public/Files/Template/Field.php b/lib/public/Files/Template/Field.php index 35e937da78f..ccab7f48b00 100644 --- a/lib/public/Files/Template/Field.php +++ b/lib/public/Files/Template/Field.php @@ -7,12 +7,10 @@ namespace OCP\Files\Template; -use OCP\Files\Template\FieldType; - class Field { public FieldType $type; public function __construct(FieldType $type) { $this->type = $type; } -} \ No newline at end of file +} diff --git a/lib/public/Files/Template/FieldType.php b/lib/public/Files/Template/FieldType.php index 27873aa9067..aaf66ce8d27 100644 --- a/lib/public/Files/Template/FieldType.php +++ b/lib/public/Files/Template/FieldType.php @@ -9,4 +9,4 @@ namespace OCP\Files\Template; enum FieldType { case PlainText; -} \ No newline at end of file +} diff --git a/lib/public/Files/Template/Template.php b/lib/public/Files/Template/Template.php index 3bebab2c3a8..634935d212e 100644 --- a/lib/public/Files/Template/Template.php +++ b/lib/public/Files/Template/Template.php @@ -9,8 +9,6 @@ declare(strict_types=1); namespace OCP\Files\Template; use OCP\Files\File; -use OCP\Files\Template\Field; -use OCP\Files\Template\FieldType; /** * @since 21.0.0 -- 2.39.5