Merge pull request #6241 from WoltLab/6.2-obsolete-type-casting

Remove obsolete type-casting

Author: BurntimeX

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(

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([

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(

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')

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([

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 {

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();

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);

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);
         }
     }

wcfsetup/install/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'));