WoltLab · BurntimeX · Mar 12, 2025 · Mar 11, 2025
diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderAddForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderAddForm.class.php
@@ -88,8 +88,7 @@ protected function createForm()
                         ->description('wcf.acp.bbcode.mediaProvider.html.description')
                         ->addValidator(
                             new FormFieldValidator('emptyValidator', function (MultilineTextFormField $formField) {
-                                $classNameFormField = $formField->getDocument()->getNodeById('className');
-                                \assert($classNameFormField instanceof ClassNameFormField);
+                                $classNameFormField = $formField->getDocument()->getFormField('className');
 
                                 if (empty($formField->getValue()) && empty($classNameFormField->getValue())) {
                                     $formField->addValidationError(

diff --git a/wcfsetup/install/files/lib/acp/form/FirstTimeSetupLicenseForm.class.php b/wcfsetup/install/files/lib/acp/form/FirstTimeSetupLicenseForm.class.php
@@ -83,8 +83,7 @@ protected function createForm()
                         ->addFieldClass('medium')
                         ->placeholder('XXXX-XXXX-XXXX-XXXX-XXXX')
                         ->addValidator(new FormFieldValidator('serialNo', function (TextFormField $serialNo) {
-                            $licenseNo = $serialNo->getDocument()->getNodeById('licenseNo');
-                            \assert($licenseNo instanceof TextFormField);
+                            $licenseNo = $serialNo->getDocument()->getFormField('licenseNo');
 
                             try {
                                 $this->licenseData = $this->licenseApi->fetchFromRemote([

diff --git a/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php
@@ -136,9 +136,7 @@ static function (SingleSelectionFormField $formField) {
                                     return;
                                 }
 
-                                $languageCodeField = $formField->getDocument()->getNodeById('languageCode');
-                                \assert($languageCodeField instanceof TextFormField);
-
+                                $languageCodeField = $formField->getDocument()->getFormField('languageCode');
                                 [$languageCode] = \explode('_', $formField->getValue());
                                 if ($languageCodeField->getValue() !== $languageCode) {
                                     $formField->addValidationError(

diff --git a/wcfsetup/install/files/lib/acp/form/LanguageItemAddForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageItemAddForm.class.php
@@ -102,9 +102,7 @@ protected function createForm()
                     ->addValidator(new FormFieldValidator(
                         'languageCategory',
                         static function (TextFormField $formField) {
-                            /** @var RadioButtonFormField $languageCategoryIDMode */
-                            $languageCategoryIDMode = $formField->getDocument()->getNodeById('languageCategoryIDMode');
-
+                            $languageCategoryIDMode = $formField->getDocument()->getFormField('languageCategoryIDMode');
                             switch ($languageCategoryIDMode->getSaveValue()) {
                                 case 'automatic':
                                     $languageItemPieces = \explode('.', $formField->getSaveValue());
@@ -130,9 +128,7 @@ static function (TextFormField $formField) {
                                     break;
 
                                 case 'selection':
-                                    /** @var SingleSelectionFormField $languageCategoryID */
-                                    $languageCategoryID = $formField->getDocument()->getNodeById('languageCategoryID');
-
+                                    $languageCategoryID = $formField->getDocument()->getFormField('languageCategoryID');
                                     if ($languageCategory = LanguageFactory::getInstance()->getCategoryByID($languageCategoryID->getSaveValue())) {
                                         if (
                                             \strpos(
@@ -187,13 +183,10 @@ static function (IFormDocument $document, array $parameters) {
                     $parameters['data']['languageItemOriginIsSystem'] = 0;
                     $parameters['data']['isCustomLanguageItem'] = 1;
 
-                    /** @var RadioButtonFormField $languageCategoryIDMode */
-                    $languageCategoryIDMode = $document->getNodeById('languageCategoryIDMode');
-
+                    $languageCategoryIDMode = $document->getFormField('languageCategoryIDMode');
                     // automatically determine language item
                     if ($languageCategoryIDMode->getSaveValue() === 'automatic') {
-                        /** @var TextFormField $languageItemField */
-                        $languageItemField = $document->getNodeById('languageItem');
+                        $languageItemField = $document->getFormField('languageItem');
                         $languageItemPieces = \explode('.', $languageItemField->getSaveValue());
 
                         $category = LanguageFactory::getInstance()->getCategory(
@@ -217,8 +210,8 @@ static function (IFormDocument $document, array $parameters) {
             )
         );
 
-        /** @var RadioButtonFormField $modeField */
         $modeField = $dataContainer->getNodeById('languageCategoryIDMode');
+        \assert($modeField instanceof RadioButtonFormField);
 
         $dataContainer->getNodeById('languageCategoryID')->addDependency(
             ValueFormFieldDependency::create('mode')

diff --git a/wcfsetup/install/files/lib/acp/form/LicenseEditForm.class.php b/wcfsetup/install/files/lib/acp/form/LicenseEditForm.class.php
@@ -112,8 +112,7 @@ protected function createForm()
                         ->value($serialNo)
                         ->placeholder('XXXX-XXXX-XXXX-XXXX-XXXX')
                         ->addValidator(new FormFieldValidator('serialNo', function (TextFormField $serialNo) {
-                            $licenseNo = $serialNo->getDocument()->getNodeById('licenseNo');
-                            \assert($licenseNo instanceof TextFormField);
+                            $licenseNo = $serialNo->getDocument()->getFormField('licenseNo');
 
                             try {
                                 $this->licenseData = $this->licenseApi->fetchFromRemote([

diff --git a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php
@@ -132,8 +132,7 @@ public function readParameters()
 
     protected function validatePassword(PasswordFormField $passwordFormField): void
     {
-        $usernameFormField = $this->form->getNodeById('username');
-        \assert($usernameFormField instanceof TextFormField);
+        $usernameFormField = $this->form->getFormField('username');
         $validationError = null;
 
         try {

diff --git a/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php b/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php
@@ -159,8 +159,7 @@ protected function createForm()
                         ->addFieldClass('short')
                         ->addValidator(
                             new FormFieldValidator('requiredObjectIDValidator', function (IntegerFormField $formField) {
-                                $pageFormField = $this->form->getNodeById('pageID');
-                                \assert($pageFormField instanceof SingleSelectionFormField);
+                                $pageFormField = $this->form->getFormField('pageID');
                                 $pageID = $pageFormField->getValue();
                                 $page = new Page($pageID);
                                 $pageObjectID = $formField->getValue();

diff --git a/wcfsetup/install/files/lib/acp/form/TagAddForm.class.php b/wcfsetup/install/files/lib/acp/form/TagAddForm.class.php
@@ -70,8 +70,7 @@ protected function createForm()
                         ->maximumLength(TAGGING_MAX_TAG_LENGTH)
                         ->addValidator(
                             new FormFieldValidator('duplicateTagValidator', function (TextFormField $field) {
-                                $languageIDFormField = $field->getDocument()->getNodeById('languageID');
-                                \assert($languageIDFormField instanceof SingleSelectionFormField);
+                                $languageIDFormField = $field->getDocument()->getFormField('languageID');
                                 $languageID = $languageIDFormField->getValue();
 
                                 $tag = Tag::getTag($field->getValue(), $languageID);

diff --git a/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php
@@ -88,8 +88,7 @@ protected function createForm()
                                 );
                                 \assert($templateGroup instanceof TemplateGroup);
 
-                                $tplNameFormField = $formField->getDocument()->getNodeById('templateName');
-                                \assert($tplNameFormField instanceof TextFormField);
+                                $tplNameFormField = $formField->getDocument()->getFormField('templateName');
                                 $tplName = $tplNameFormField->getSaveValue();
 
                                 if (
@@ -130,9 +129,7 @@ protected function createForm()
                         )
                         ->addValidator(
                             new FormFieldValidator('unique', function (TextFormField $formField) {
-                                $templateGroupIDFormField = $formField->getDocument()->getNodeById('templateGroupID');
-                                \assert($templateGroupIDFormField instanceof SingleSelectionFormField);
-
+                                $templateGroupIDFormField = $formField->getDocument()->getFormField('templateGroupID');
                                 $conditionBuilder = new PreparedStatementConditionBuilder();
                                 $conditionBuilder->add('templateName = ?', [$formField->getSaveValue()]);
                                 $conditionBuilder->add('templateGroupID = ?', [
@@ -261,12 +258,10 @@ public function readData()
         parent::readData();
 
         if ($_POST === [] && isset($this->copiedTemplate)) {
-            $templateSource = $this->form->getNodeById('templateSource');
-            \assert($templateSource instanceof SourceCodeFormField);
+            $templateSource = $this->form->getFormField('templateSource');
             $templateSource->value($this->copiedTemplate->getSource());
 
-            $templateName = $this->form->getNodeById('templateName');
-            \assert($templateName instanceof TextFormField);
+            $templateName = $this->form->getFormField('templateName');
             $templateName->value($this->copiedTemplate->templateName);
         }
     }

diff --git a/...nstall/files/lib/system/form/builder/container/wysiwyg/WysiwygPollFormContainer.class.php b/...nstall/files/lib/system/form/builder/container/wysiwyg/WysiwygPollFormContainer.class.php
@@ -318,8 +318,7 @@ function (IFormDocument $document, array $parameters) use ($id) {
         $this->optionsField = PollOptionsFormField::create($id . 'Options')
             ->wysiwygId($this->getWysiwygId())
             ->addValidator(new FormFieldValidator('empty', static function (PollOptionsFormField $formField) use ($id) {
-                /** @var TextFormField $questionFormField */
-                $questionFormField = $formField->getDocument()->getNodeById($id . 'Question');
+                $questionFormField = $formField->getDocument()->getFormField($id . 'Question');
 
                 if (empty($formField->getValue()) && $questionFormField->getValue() !== '') {
                     $formField->addValidationError(new FormFieldValidationError('empty'));

diff --git a/...etup/install/files/lib/system/package/plugin/ACLOptionPackageInstallationPlugin.class.php b/...etup/install/files/lib/system/package/plugin/ACLOptionPackageInstallationPlugin.class.php
@@ -419,8 +419,7 @@ protected function addFormFields(IFormDocument $form)
             ->addValidator(new FormFieldValidator(
                 'nameUniqueness',
                 function (SingleSelectionFormField $formField) use ($entryType) {
-                    /** @var TextFormField $nameField */
-                    $nameField = $formField->getDocument()->getNodeById('name');
+                    $nameField = $formField->getDocument()->getFormField('name');
 
                     if (
                         $formField->getDocument()->getFormMode() === IFormDocument::FORM_MODE_CREATE

diff --git a/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
@@ -89,8 +89,7 @@ protected function addFormFields(IFormDocument $form)
 
         // add menu item icon form field
 
-        /** @var SingleSelectionFormField $parentMenuItemFormField */
-        $parentMenuItemFormField = $form->getNodeById('parentMenuItem');
+        $parentMenuItemFormField = $form->getFormField('parentMenuItem');
 
         $menuItemLevels = ['' => 0] + $this->getMenuStructureData()['levels'];
 
@@ -115,17 +114,15 @@ protected function addFormFields(IFormDocument $form)
 
         // add additional data to default fields
 
-        /** @var TextFormField $menuItemFormField */
-        $menuItemFormField = $form->getNodeById('menuItem');
+        $menuItemFormField = $form->getFormField('menuItem');
         $menuItemFormField
             ->description('wcf.acp.pip.acpMenu.menuItem.description')
             ->addValidator(FormFieldValidatorUtil::getRegularExpressionValidator(
                 '[a-z]+\.acp\.menu\.link(\.[A-z0-9])+',
                 'wcf.acp.pip.acpMenu.menuItem'
             ));
 
-        /** @var TextFormField $menuItemControllerFormField */
-        $menuItemControllerFormField = $form->getNodeById('menuItemController');
+        $menuItemControllerFormField = $form->getFormField('menuItemController');
         $menuItemControllerFormField->addValidator(new FormFieldValidator(
             'acpController',
             static function (TextFormField $formField) {
@@ -154,8 +151,7 @@ static function (TextFormField $formField) {
         }));
 
         foreach (['menuItemController', 'menuItemLink'] as $nodeId) {
-            /** @var TextFormField $formField */
-            $formField = $form->getNodeById($nodeId);
+            $formField = $form->getFormField($nodeId);
             $formField->addDependency(
                 ValueFormFieldDependency::create('parentMenuItem')
                     ->field($parentMenuItemFormField)

diff --git a/...p/install/files/lib/system/package/plugin/AbstractMenuPackageInstallationPlugin.class.php b/...p/install/files/lib/system/package/plugin/AbstractMenuPackageInstallationPlugin.class.php
@@ -211,8 +211,7 @@ function (SingleSelectionFormField $formField) {
                             $formField->getDocument()->getFormMode() === IFormDocument::FORM_MODE_UPDATE
                             && $formField->getSaveValue() !== ''
                         ) {
-                            /** @var TextFormField $menuItemField */
-                            $menuItemField = $formField->getDocument()->getNodeById('menuItem');
+                            $menuItemField = $formField->getDocument()->getFormField('menuItem');
                             $menuItem = $menuItemField->getSaveValue();
                             $parentMenuItem = $formField->getSaveValue();
 
@@ -268,11 +267,8 @@ function (SingleSelectionFormField $formField) {
                 ->description('wcf.acp.pip.abstractMenu.menuItemLink.description')
                 ->objectProperty('link')
                 ->addValidator(new FormFieldValidator('linkSpecified', function (TextFormField $formField) {
-                    /** @var TextFormField $menuItem */
-                    $menuItem = $formField->getDocument()->getNodeById('menuItem');
-
-                    /** @var ClassNameFormField $menuItemController */
-                    $menuItemController = $formField->getDocument()->getNodeById('menuItemController');
+                    $menuItem = $formField->getDocument()->getFormField('menuItem');
+                    $menuItemController = $formField->getDocument()->getFormField('menuItemController');
 
                     // ensure that either a menu item controller is specified or a link
                     // and workaround for special ACP menu item `wcf.acp.menu.link.option.category`
@@ -290,8 +286,7 @@ function (SingleSelectionFormField $formField) {
                 }))
                 ->addValidator(new FormFieldValidator('format', static function (TextFormField $formField) {
                     if ($formField->getSaveValue() !== '') {
-                        /** @var ClassNameFormField $menuItemController */
-                        $menuItemController = $formField->getDocument()->getNodeById('menuItemController');
+                        $menuItemController = $formField->getDocument()->getFormField('menuItemController');
 
                         if (!$menuItemController->getSaveValue() && !Url::is($formField->getSaveValue())) {
                             $formField->addValidationError(

diff --git a/...install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php b/...install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php
@@ -2,7 +2,6 @@
 
 namespace wcf\system\package\plugin;
 
-use DOMNode;
 use wcf\data\DatabaseObject;
 use wcf\data\IEditableCachedObject;
 use wcf\data\option\category\OptionCategory;
@@ -627,8 +626,7 @@ protected function addFormFields(IFormDocument $form)
                         )),
                 ]);
 
-                /** @var SingleSelectionFormField $optionType */
-                $optionType = $form->getNodeById('optionType');
+                $optionType = $form->getFormField('optionType');
 
                 // add option-specific fields
                 $dataContainer->appendChildren([

diff --git a/...files/lib/system/package/plugin/AbstractTemplateDeletePackageInstallationPlugin.class.php b/...files/lib/system/package/plugin/AbstractTemplateDeletePackageInstallationPlugin.class.php
@@ -37,8 +37,7 @@ protected function addFormFields(IFormDocument $form)
     {
         parent::addFormFields($form);
 
-        /** @var TextFormField $templateFormField */
-        $templateFormField = $form->getNodeById($this->tagName);
+        $templateFormField = $form->getFormField($this->tagName);
         $templateFormField->addValidator(new FormFieldValidator('tplSuffix', static function (TextFormField $formField) {
             if (\substr($formField->getValue(), -4) === '.tpl') {
                 $formField->addValidationError(new FormFieldValidationError(

diff --git a/...nstall/files/lib/system/package/plugin/ClipboardActionPackageInstallationPlugin.class.php b/...nstall/files/lib/system/package/plugin/ClipboardActionPackageInstallationPlugin.class.php
@@ -217,8 +217,7 @@ protected function addFormFields(IFormDocument $form)
                 ->required()
                 ->implementedInterface(IClipboardAction::class)
                 ->addValidator(new FormFieldValidator('uniqueness', function (ClassNameFormField $formField) {
-                    /** @var TextFormField $actionNameFormField */
-                    $actionNameFormField = $formField->getDocument()->getNodeById('actionName');
+                    $actionNameFormField = $formField->getDocument()->getFormField('actionName');
 
                     if (
                         $formField->getDocument()->getFormMode() === IFormDocument::FORM_MODE_CREATE
@@ -306,7 +305,7 @@ public function getElementIdentifier(\DOMElement $element)
     {
         return \sha1(
             $element->getElementsByTagName('actionclassname')->item(0)->nodeValue . '/'
-            . $element->getAttribute('name')
+                . $element->getAttribute('name')
         );
     }
 

diff --git a/.../install/files/lib/system/package/plugin/EventListenerPackageInstallationPlugin.class.php b/.../install/files/lib/system/package/plugin/EventListenerPackageInstallationPlugin.class.php
@@ -233,8 +233,7 @@ protected function addFormFields(IFormDocument $form)
                 ->required()
                 ->addValidator(new FormFieldValidator('callable', static function (ClassNameFormField $formField) {
                     $listenerClassName = $formField->getValue();
-                    /** @var TextFormField $eventClassNameField */
-                    $eventClassNameField = $formField->getDocument()->getNodeById('eventClassName');
+                    $eventClassNameField = $formField->getDocument()->getFormField('eventClassName');
                     $eventClassName = $eventClassNameField->getValue();
 
                     if (\is_subclass_of($eventClassName, IEvent::class)) {
@@ -307,10 +306,8 @@ protected function addFormFields(IFormDocument $form)
      */
     public function setEntryData($identifier, IFormDocument $document): bool
     {
-        $options = $document->getNodeById('options');
-        \assert($options instanceof OptionFormField);
-        $permissions = $document->getNodeById('permissions');
-        \assert($permissions instanceof UserGroupOptionFormField);
+        $options = $document->getFormField('options');
+        $permissions = $document->getFormField('permissions');
 
         $result = $this->traitSetEntryData($identifier, $document);
 
@@ -331,10 +328,8 @@ public function setEntryData($identifier, IFormDocument $document): bool
      */
     public function editEntry(IFormDocument $form, $identifier)
     {
-        $options = $form->getNodeById('options');
-        \assert($options instanceof OptionFormField);
-        $permissions = $form->getNodeById('permissions');
-        \assert($permissions instanceof UserGroupOptionFormField);
+        $options = $form->getFormField('options');
+        $permissions = $form->getFormField('permissions');
 
         $result = $this->traitEditEntry($form, $identifier);