Add DatabaseObjectBuilder with TagBuilder implementation

wcfsetup/install/files/lib/acp/form/TagAddForm.class.php

@@ -2,19 +2,20 @@
 
 namespace wcf\acp\form;
 
-use wcf\data\IStorableObject;
+use wcf\command\tag\CreateTag;
+use wcf\command\tag\UpdateTag;
+use wcf\data\DatabaseObjectBuilder;
 use wcf\data\tag\Tag;
-use wcf\data\tag\TagAction;
+use wcf\data\tag\TagBuilder;
 use wcf\data\tag\TagList;
-use wcf\form\AbstractFormBuilderForm;
+use wcf\form\AbstractDatabaseObjectBuilderForm;
 use wcf\system\form\builder\container\FormContainer;
-use wcf\system\form\builder\data\processor\CustomFormDataProcessor;
+use wcf\system\form\builder\field\IFormField;
 use wcf\system\form\builder\field\SingleSelectionFormField;
 use wcf\system\form\builder\field\tag\TagFormField;
 use wcf\system\form\builder\field\TextFormField;
 use wcf\system\form\builder\field\validation\FormFieldValidationError;
 use wcf\system\form\builder\field\validation\FormFieldValidator;
-use wcf\system\form\builder\IFormDocument;
 use wcf\system\form\builder\TemplateFormNode;
 use wcf\system\language\LanguageFactory;
 use wcf\system\WCF;
@@ -23,13 +24,13 @@
 /**
  * Shows the tag add form.
  *
- * @author      Olaf Braun, Tim Duesterhus
- * @copyright   2001-2024 WoltLab GmbH
+ * @author      Olaf Braun, Tim Duesterhus, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
- * @extends AbstractFormBuilderForm<Tag>
+ * @extends AbstractDatabaseObjectBuilderForm<Tag, TagBuilder>
  */
-class TagAddForm extends AbstractFormBuilderForm
+class TagAddForm extends AbstractDatabaseObjectBuilderForm
 {
     /**
      * @inheritDoc
@@ -49,18 +50,31 @@ class TagAddForm extends AbstractFormBuilderForm
     /**
      * @inheritDoc
      */
-    public $objectActionClass = TagAction::class;
+    public string $objectEditLinkController = TagEditForm::class;
 
-    /**
-     * @inheritDoc
-     */
-    public $objectEditLinkController = TagEditForm::class;
+    #[\Override]
+    protected function getDatabaseObjectBuilder(): TagBuilder
+    {
+        if ($this->formObject !== null) {
+            return TagBuilder::forUpdate($this->formObject);
+        }
+
+        return TagBuilder::forCreate();
+    }
 
     #[\Override]
-    protected function createForm()
+    protected function getCommand(DatabaseObjectBuilder $builder): callable
     {
-        parent::createForm();
+        if ($this->formObject !== null) {
+            return new UpdateTag($builder);
+        }
 
+        return new CreateTag($builder);
+    }
+
+    #[\Override]
+    protected function createForm(): void
+    {
         $contentLanguages = LanguageFactory::getInstance()->getContentLanguages();
 
         $this->form->appendChildren([
@@ -70,12 +84,20 @@ protected function createForm()
                         ->label('wcf.global.name')
                         ->required()
                         ->maximumLength(\TAGGING_MAX_TAG_LENGTH)
+                        ->saveValueCallback(static function (TagBuilder $builder, IFormField $field) {
+                            $builder->setName(
+                                \str_replace(',', '', StringUtil::trim($field->getSaveValue()))
+                            );
+                        })
+                        ->loadValueCallback(static function (Tag $object, IFormField $field) {
+                            $field->value($object->name);
+                        })
                         ->addValidator(
                             new FormFieldValidator('duplicateTagValidator', function (TextFormField $field) {
                                 $languageIDFormField = $field->getDocument()->getFormField('languageID');
                                 $languageID = $languageIDFormField->getValue();
 
-                                $tag = Tag::getTag($field->getValue(), $languageID);
+                                $tag = Tag::getTag($field->getValue(), $languageID ?? 0);
                                 if ($tag !== null && $tag->tagID !== $this->formObject?->tagID) {
                                     $field->addValidationError(
                                         new FormFieldValidationError(
@@ -92,10 +114,30 @@ protected function createForm()
                         ->options($contentLanguages)
                         ->value(isset($contentLanguages[WCF::getLanguage()->languageID]) ? WCF::getLanguage()->languageID : null)
                         ->immutable($this->formAction !== 'create')
-                        ->required(),
+                        ->required()
+                        ->saveValueCallback(static function (TagBuilder $builder, IFormField $field) {
+                            $builder->setLanguageID(
+                                (int)$field->getSaveValue()
+                            );
+                        })->loadValueCallback(static function (Tag $object, IFormField $field) {
+                            $field->value($object->languageID);
+                        }),
                     TagFormField::create('synonyms')
                         ->available($this->formObject?->synonymFor === null)
-                        ->label('wcf.acp.tag.synonyms'),
+                        ->label('wcf.acp.tag.synonyms')
+                        ->saveValueCallback(static function (TagBuilder $builder, IFormField $field) {
+                            $builder->setSynonyms(
+                                $field->getSaveValue() ?? []
+                            );
+                        })->loadValueCallback(static function (Tag $object, IFormField $field) {
+                            $synonymList = new TagList();
+                            $synonymList->getConditionBuilder()->add('synonymFor = ?', [$object->getObjectID()]);
+                            $synonymList->readObjects();
+                            $field->value(\array_map(
+                                static fn($synonym) => $synonym->name,
+                                $synonymList->getObjects()
+                            ));
+                        }),
                     TemplateFormNode::create('tagSynonymFor')
                         ->available($this->formObject?->synonymFor !== null)
                         ->variables([
@@ -105,45 +147,4 @@ protected function createForm()
                 ])
         ]);
     }
-
-    #[\Override]
-    protected function finalizeForm()
-    {
-        parent::finalizeForm();
-
-        $this->form->getDataHandler()
-            ->addProcessor(
-                new CustomFormDataProcessor(
-                    'tagNameProcessor',
-                    static function (IFormDocument $document, array $parameters) {
-                        $parameters['data']['name'] = \str_replace(
-                            ',',
-                            '',
-                            StringUtil::trim($parameters['data']['name'])
-                        );
-
-                        return $parameters;
-                    }
-                )
-            )
-            ->addProcessor(
-                new CustomFormDataProcessor(
-                    'synonymsProcessor',
-                    null,
-                    static function (IFormDocument $document, array $data, IStorableObject $tag) {
-                        \assert($tag instanceof Tag);
-
-                        $synonymList = new TagList();
-                        $synonymList->getConditionBuilder()->add('synonymFor = ?', [$tag->tagID]);
-                        $synonymList->readObjects();
-                        $data['synonyms'] = [];
-                        foreach ($synonymList as $synonym) {
-                            $data['synonyms'][] = $synonym->name;
-                        }
-
-                        return $data;
-                    }
-                )
-            );
-    }
 }

wcfsetup/install/files/lib/acp/form/TagEditForm.class.php

@@ -34,7 +34,7 @@ class TagEditForm extends TagAddForm
     /**
      * @inheritDoc
      */
-    public $formAction = 'edit';
+    public string $formAction = 'edit';
 
     #[\Override]
     public function readParameters()

wcfsetup/install/files/lib/command/tag/CreateTag.class.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace wcf\command\tag;
+
+use wcf\data\tag\Tag;
+use wcf\data\tag\TagBuilder;
+use wcf\event\tag\TagCreated;
+use wcf\system\event\EventHandler;
+
+/**
+ * Creates a new tag.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class CreateTag
+{
+    public function __construct(
+        private readonly TagBuilder $builder,
+    ) {}
+
+    public function __invoke(): Tag
+    {
+        $tag = $this->builder->save();
+
+        EventHandler::getInstance()->fire(new TagCreated($tag));
+
+        return $tag;
+    }
+}

wcfsetup/install/files/lib/command/tag/UpdateTag.class.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace wcf\command\tag;
+
+use wcf\data\tag\Tag;
+use wcf\data\tag\TagBuilder;
+use wcf\event\tag\TagUpdated;
+use wcf\system\event\EventHandler;
+
+/**
+ * Updates a tag.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class UpdateTag
+{
+    public function __construct(
+        private readonly TagBuilder $builder,
+    ) {}
+
+    public function __invoke(): Tag
+    {
+        $tag = $this->builder->save();
+
+        EventHandler::getInstance()->fire(new TagUpdated($tag));
+
+        return $tag;
+    }
+}