Merge pull request #6272 from WoltLab/6.2-RadioButtonFormField-allow-empty-value

Allow empty value in `RadioButtonFormField`

Author: Cyperghost

com.woltlab.wcf/templates/shared_radioButtonFormField.tpl

@@ -1,3 +1,16 @@
+{if !$field->isRequired()}
+	<label>
+		<input {*
+			*}type="radio" {*
+			*}name="{$field->getPrefixedId()}" {*
+			*}value="" {*
+			*}{if !$field->getFieldClasses()|empty} class="{implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+			*}{if $field->getValue() === null || $field->getValue() === ''} checked{/if}{*
+			*}{if $field->isImmutable()} disabled{/if}{*
+			*}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+		*}> {lang}wcf.global.noSelection{/lang}
+	</label>
+{/if}
 {foreach from=$field->getOptions() key=$__fieldValue item=__fieldLabel}
 	<label>
 		<input {*

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

@@ -101,6 +101,7 @@ protected function createForm()
 
         $mode = RadioButtonFormField::create('mode')
             ->label('wcf.acp.devtools.project.add.mode')
+            ->required()
             ->options(function () {
                 $options = [
                     'import' => 'wcf.acp.devtools.project.add.mode.import',

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

@@ -68,6 +68,7 @@ protected function createForm()
             ->label('wcf.global.form.data')
             ->appendChildren([
                 RadioButtonFormField::create('languageCategoryIDMode')
+                    ->required()
                     ->label('wcf.acp.language.item.languageCategoryID.mode')
                     ->options([
                         'automatic' => 'wcf.acp.language.item.languageCategoryID.mode.automatic',

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

@@ -146,7 +146,8 @@ protected function createForm()
                             0 => 'wcf.acp.menu.item.link.external',
                             1 => 'wcf.acp.menu.item.link.internal',
                         ])
-                        ->value(1),
+                        ->value(1)
+                        ->required(),
                     SingleSelectionFormField::create('pageID')
                         ->label('wcf.acp.page.page')
                         ->options($pageNodeList, true)

wcfsetup/install/files/lib/data/user/ignore/UserIgnoreAction.class.php

@@ -255,6 +255,7 @@ protected function getForm(): IFormDocument
                             ->get('wcf.user.ignore.type.hideMessages'),
                     ])
                     ->value($ignore->type ?: 0)
+                    ->required()
                     ->addValidator(new FormFieldValidator('type', function (RadioButtonFormField $formField) {
                         $userProfile = UserProfileRuntimeCache::getInstance()->getObject($this->parameters['userID']);
                         if ($userProfile->getPermission('user.profile.cannotBeIgnored')) {

wcfsetup/install/files/lib/system/form/builder/field/RadioButtonFormField.class.php

@@ -62,11 +62,15 @@ public function supportsNestedOptions()
      */
     public function validate()
     {
-        if (!isset($this->getOptions()[$this->getValue()])) {
-            $this->addValidationError(new FormFieldValidationError(
-                'invalidValue',
-                'wcf.global.form.error.noValidSelection'
-            ));
+        if ($this->isRequired() || $this->getValue() !== '') {
+            if (!isset($this->getOptions()[$this->getValue()])) {
+                $this->addValidationError(
+                    new FormFieldValidationError(
+                        'invalidValue',
+                        'wcf.global.form.error.noValidSelection'
+                    )
+                );
+            }
         }
 
         parent::validate();

wcfsetup/install/files/lib/system/package/plugin/BoxPackageInstallationPlugin.class.php

@@ -560,7 +560,8 @@ protected function addFormFields(IFormDocument $form)
                 ->label('wcf.acp.pip.box.boxType')
                 ->description('wcf.acp.pip.box.boxType.description')
                 ->options(\array_combine(Box::$availableBoxTypes, Box::$availableBoxTypes))
-                ->value('text'),
+                ->value('text')
+                ->required(),
 
             SingleSelectionFormField::create('objectType')
                 ->label('wcf.acp.pip.box.objectType')

wcfsetup/install/files/lib/system/package/plugin/LanguagePackageInstallationPlugin.class.php

@@ -359,7 +359,8 @@ protected function addFormFields(IFormDocument $form)
                     'selection' => 'wcf.acp.language.item.languageCategoryID.mode.selection',
                     'new' => 'wcf.acp.language.item.languageCategoryID.mode.new',
                 ])
-                ->value('automatic'),
+                ->value('automatic')
+                ->required(),
 
             SingleSelectionFormField::create('languageCategoryID')
                 ->label('wcf.acp.language.item.languageCategoryID')

wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php

@@ -489,7 +489,8 @@ protected function addFormFields(IFormDocument $form)
                 ->label('wcf.acp.pip.page.pageType')
                 ->description('wcf.acp.pip.page.pageType.description')
                 ->options(\array_combine(Page::$availablePageTypes, Page::$availablePageTypes))
-                ->addClass('floated'),
+                ->addClass('floated')
+                ->required(),
 
             TextFormField::create('name')
                 ->label('wcf.acp.pip.page.name')

wcfsetup/install/files/lib/system/user/multifactor/TotpMultifactorMethod.class.php

@@ -280,7 +280,8 @@ public function createAuthenticationForm(IFormDocument $form, Setup $setup): voi
                     ->description('wcf.user.security.multifactor.totp.deviceName.description.auth')
                     ->objectProperty('deviceID')
                     ->options($deviceOptions)
-                    ->value($mostRecentlyUsed['deviceID']),
+                    ->value($mostRecentlyUsed['deviceID'])
+                    ->required(),
             ]);
         }