Ensure form-control class is not injected into RadioButtonGroup and CheckboxButtonGroup

Author: badams

src/CheckboxButtonGroup.php

@@ -178,13 +178,11 @@ private function renderButtons()
             $buttons .= Html::button($label, $buttonOptions);
         }
 
-        $class = 'btn-group checkbox-button-group';
-        if (isset($this->options['class'])) {
-            $class .= ' '.$this->options['class'];
-        }
+        Html::addCssClass($this->options, ['btn-group' , 'checkbox-button-group']);
+        Html::removeCssClass($this->options, 'form-control');
 
         return Html::tag('div', $buttons, [
-            'class' => $class,
+            'class' => $this->options['class'],
             'style' => 'display: none;',
             'id' => $this->widgetId.'-buttons',
         ]);

src/RadioButtonGroup.php

@@ -110,10 +110,8 @@ public function run()
             ]);
         }
 
-        $class = 'radio-button-group';
-        if (isset($this->options['class'])) {
-            $class .= ' '.$this->options['class'];
-        }
+        Html::addCssClass($this->options, 'radio-button-group');
+        Html::removeCssClass($this->options, 'form-control');
 
         echo Html::tag(
             'div',
@@ -123,7 +121,7 @@ public function run()
                 'data-field' => '#'.$this->options['id'],
             ]),
             [
-                'class' => $class,
+                'class' => $this->options['class'],
             ]
         );
 

tests/__snapshots__/RadioButtonGroupTest__testRenderWithOptions__1.php

@@ -1 +1 @@
-<?php return '<div class="radio-button-group foobar"><div id="radio_button_test" class="btn-group" data-field="#test"><button type="button" class="btn btn-primary" data-value="1" data-show=".show-if-yes" data-hide=".show-if-no">Yes</button><button type="button" class="btn btn-primary active" data-value="0" data-show=".show-if-no" data-hide=".show-if-yes">No</button><button type="button" class="btn btn-primary" disabled data-value="3">Maybe</button></div></div><input type="hidden" id="test" class="test-class" name="test-widget-name">';
+<?php return '<div class="foobar radio-button-group"><div id="radio_button_test" class="btn-group" data-field="#test"><button type="button" class="btn btn-primary" data-value="1" data-show=".show-if-yes" data-hide=".show-if-no">Yes</button><button type="button" class="btn btn-primary active" data-value="0" data-show=".show-if-no" data-hide=".show-if-yes">No</button><button type="button" class="btn btn-primary" disabled data-value="3">Maybe</button></div></div><input type="hidden" id="test" class="test-class" name="test-widget-name">';