Skip to content

Commit ea3a11b

Browse files
BurntimeXBurntimeX
committed
Remove obsolete type-casting
1 parent 2344052 commit ea3a11b

30 files changed

+84
-179
lines changed

‎wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderAddForm.class.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ protected function createForm()
8888
->description('wcf.acp.bbcode.mediaProvider.html.description')
8989
->addValidator(
9090
new FormFieldValidator('emptyValidator', function (MultilineTextFormField $formField) {
91-
$classNameFormField = $formField->getDocument()->getNodeById('className');
92-
\assert($classNameFormField instanceof ClassNameFormField);
91+
$classNameFormField = $formField->getDocument()->getFormField('className');
9392

9493
if (empty($formField->getValue()) && empty($classNameFormField->getValue())) {
9594
$formField->addValidationError(

‎wcfsetup/install/files/lib/acp/form/FirstTimeSetupLicenseForm.class.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ protected function createForm()
8383
->addFieldClass('medium')
8484
->placeholder('XXXX-XXXX-XXXX-XXXX-XXXX')
8585
->addValidator(new FormFieldValidator('serialNo', function (TextFormField $serialNo) {
86-
$licenseNo = $serialNo->getDocument()->getNodeById('licenseNo');
87-
\assert($licenseNo instanceof TextFormField);
86+
$licenseNo = $serialNo->getDocument()->getFormField('licenseNo');
8887

8988
try {
9089
$this->licenseData = $this->licenseApi->fetchFromRemote([

‎wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,7 @@ static function (SingleSelectionFormField $formField) {
136136
return;
137137
}
138138

139-
$languageCodeField = $formField->getDocument()->getNodeById('languageCode');
140-
\assert($languageCodeField instanceof TextFormField);
141-
139+
$languageCodeField = $formField->getDocument()->getFormField('languageCode');
142140
[$languageCode] = \explode('_', $formField->getValue());
143141
if ($languageCodeField->getValue() !== $languageCode) {
144142
$formField->addValidationError(

‎wcfsetup/install/files/lib/acp/form/LanguageItemAddForm.class.php‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ protected function createForm()
102102
->addValidator(new FormFieldValidator(
103103
'languageCategory',
104104
static function (TextFormField $formField) {
105-
/** @var RadioButtonFormField $languageCategoryIDMode */
106-
$languageCategoryIDMode = $formField->getDocument()->getNodeById('languageCategoryIDMode');
107-
105+
$languageCategoryIDMode = $formField->getDocument()->getFormField('languageCategoryIDMode');
108106
switch ($languageCategoryIDMode->getSaveValue()) {
109107
case 'automatic':
110108
$languageItemPieces = \explode('.', $formField->getSaveValue());
@@ -130,9 +128,7 @@ static function (TextFormField $formField) {
130128
break;
131129

132130
case 'selection':
133-
/** @var SingleSelectionFormField $languageCategoryID */
134-
$languageCategoryID = $formField->getDocument()->getNodeById('languageCategoryID');
135-
131+
$languageCategoryID = $formField->getDocument()->getFormField('languageCategoryID');
136132
if ($languageCategory = LanguageFactory::getInstance()->getCategoryByID($languageCategoryID->getSaveValue())) {
137133
if (
138134
\strpos(
@@ -187,13 +183,10 @@ static function (IFormDocument $document, array $parameters) {
187183
$parameters['data']['languageItemOriginIsSystem'] = 0;
188184
$parameters['data']['isCustomLanguageItem'] = 1;
189185

190-
/** @var RadioButtonFormField $languageCategoryIDMode */
191-
$languageCategoryIDMode = $document->getNodeById('languageCategoryIDMode');
192-
186+
$languageCategoryIDMode = $document->getFormField('languageCategoryIDMode');
193187
// automatically determine language item
194188
if ($languageCategoryIDMode->getSaveValue() === 'automatic') {
195-
/** @var TextFormField $languageItemField */
196-
$languageItemField = $document->getNodeById('languageItem');
189+
$languageItemField = $document->getFormField('languageItem');
197190
$languageItemPieces = \explode('.', $languageItemField->getSaveValue());
198191

199192
$category = LanguageFactory::getInstance()->getCategory(
@@ -217,8 +210,8 @@ static function (IFormDocument $document, array $parameters) {
217210
)
218211
);
219212

220-
/** @var RadioButtonFormField $modeField */
221213
$modeField = $dataContainer->getNodeById('languageCategoryIDMode');
214+
\assert($modeField instanceof RadioButtonFormField);
222215

223216
$dataContainer->getNodeById('languageCategoryID')->addDependency(
224217
ValueFormFieldDependency::create('mode')

‎wcfsetup/install/files/lib/acp/form/LicenseEditForm.class.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ protected function createForm()
112112
->value($serialNo)
113113
->placeholder('XXXX-XXXX-XXXX-XXXX-XXXX')
114114
->addValidator(new FormFieldValidator('serialNo', function (TextFormField $serialNo) {
115-
$licenseNo = $serialNo->getDocument()->getNodeById('licenseNo');
116-
\assert($licenseNo instanceof TextFormField);
115+
$licenseNo = $serialNo->getDocument()->getFormField('licenseNo');
117116

118117
try {
119118
$this->licenseData = $this->licenseApi->fetchFromRemote([

‎wcfsetup/install/files/lib/acp/form/LoginForm.class.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ public function readParameters()
132132

133133
protected function validatePassword(PasswordFormField $passwordFormField): void
134134
{
135-
$usernameFormField = $this->form->getNodeById('username');
136-
\assert($usernameFormField instanceof TextFormField);
135+
$usernameFormField = $this->form->getFormField('username');
137136
$validationError = null;
138137

139138
try {

‎wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@ protected function createForm()
159159
->addFieldClass('short')
160160
->addValidator(
161161
new FormFieldValidator('requiredObjectIDValidator', function (IntegerFormField $formField) {
162-
$pageFormField = $this->form->getNodeById('pageID');
163-
\assert($pageFormField instanceof SingleSelectionFormField);
162+
$pageFormField = $this->form->getFormField('pageID');
164163
$pageID = $pageFormField->getValue();
165164
$page = new Page($pageID);
166165
$pageObjectID = $formField->getValue();

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ protected function createForm()
7070
->maximumLength(TAGGING_MAX_TAG_LENGTH)
7171
->addValidator(
7272
new FormFieldValidator('duplicateTagValidator', function (TextFormField $field) {
73-
$languageIDFormField = $field->getDocument()->getNodeById('languageID');
74-
\assert($languageIDFormField instanceof SingleSelectionFormField);
73+
$languageIDFormField = $field->getDocument()->getFormField('languageID');
7574
$languageID = $languageIDFormField->getValue();
7675

7776
$tag = Tag::getTag($field->getValue(), $languageID);

‎wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ protected function createForm()
8888
);
8989
\assert($templateGroup instanceof TemplateGroup);
9090

91-
$tplNameFormField = $formField->getDocument()->getNodeById('templateName');
92-
\assert($tplNameFormField instanceof TextFormField);
91+
$tplNameFormField = $formField->getDocument()->getFormField('templateName');
9392
$tplName = $tplNameFormField->getSaveValue();
9493

9594
if (
@@ -130,9 +129,7 @@ protected function createForm()
130129
)
131130
->addValidator(
132131
new FormFieldValidator('unique', function (TextFormField $formField) {
133-
$templateGroupIDFormField = $formField->getDocument()->getNodeById('templateGroupID');
134-
\assert($templateGroupIDFormField instanceof SingleSelectionFormField);
135-
132+
$templateGroupIDFormField = $formField->getDocument()->getFormField('templateGroupID');
136133
$conditionBuilder = new PreparedStatementConditionBuilder();
137134
$conditionBuilder->add('templateName = ?', [$formField->getSaveValue()]);
138135
$conditionBuilder->add('templateGroupID = ?', [
@@ -261,12 +258,10 @@ public function readData()
261258
parent::readData();
262259

263260
if ($_POST === [] && isset($this->copiedTemplate)) {
264-
$templateSource = $this->form->getNodeById('templateSource');
265-
\assert($templateSource instanceof SourceCodeFormField);
261+
$templateSource = $this->form->getFormField('templateSource');
266262
$templateSource->value($this->copiedTemplate->getSource());
267263

268-
$templateName = $this->form->getNodeById('templateName');
269-
\assert($templateName instanceof TextFormField);
264+
$templateName = $this->form->getFormField('templateName');
270265
$templateName->value($this->copiedTemplate->templateName);
271266
}
272267
}

‎wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygPollFormContainer.class.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,7 @@ function (IFormDocument $document, array $parameters) use ($id) {
318318
$this->optionsField = PollOptionsFormField::create($id . 'Options')
319319
->wysiwygId($this->getWysiwygId())
320320
->addValidator(new FormFieldValidator('empty', static function (PollOptionsFormField $formField) use ($id) {
321-
/** @var TextFormField $questionFormField */
322-
$questionFormField = $formField->getDocument()->getNodeById($id . 'Question');
321+
$questionFormField = $formField->getDocument()->getFormField($id . 'Question');
323322

324323
if (empty($formField->getValue()) && $questionFormField->getValue() !== '') {
325324
$formField->addValidationError(new FormFieldValidationError('empty'));

0 commit comments

Comments
 (0)