Update the _addButtonClasses method to not add duplicate btn-xxxx classes.

Author: Holt59

src/View/Helper/BootstrapFormHelper.php

@@ -116,9 +116,6 @@ class BootstrapFormHelper extends FormHelper {
     public $horizontal = false ;
     public $inline = false ;
 
-    private $buttonTypes = ['default', 'primary', 'info', 'success', 'warning', 'danger', 'link'] ;
-    private $buttonSizes = ['xs', 'sm', 'lg'] ;
-
     /**
      *
      * Replace the templates with the ones specified by newTemplates, call the specified function

src/View/Helper/BootstrapTrait.php

@@ -75,13 +75,13 @@ protected function _addButtonClasses ($options) {
         ];
         $type = $options['bootstrap-type'];
         $size = $options['bootstrap-size'];
-        unset($options['bootstrap-type'], $options['bootstrap-size']) ;
-        $options = $this->addClass($options, 'btn') ;
-        if (in_array($type, $this->buttonTypes)) {
-            $options = $this->addClass($options, 'btn-'.$type) ;
+        unset($options['bootstrap-type'], $options['bootstrap-size']);
+        $options = $this->addClass($options, 'btn');
+        if (!preg_match('#btn-[a-z]+#', $options['class'])) {
+            $options = $this->addClass($options, 'btn-'.$type);
         }
-        if (in_array($size, $this->buttonSizes)) {
-            $options = $this->addClass($options, 'btn-'.$size) ;
+        if ($size) {
+            $options = $this->addClass($options, 'btn-'.$size);
         }
         return $options ;
     }

tests/TestCase/View/Helper/BootstrapFormHelperTest.php

@@ -63,6 +63,38 @@ public function testCreate () {
         $this->assertEquals($this->Form->inline, false) ;
     }
 
+    public function testButton () {
+        // default button
+        $button = $this->Form->button('Test');
+        $this->assertHtml([
+            ['button' => [
+                'class' => 'btn btn-default',
+                'type' => 'submit'
+            ]], 'Test', '/button'
+        ], $button);
+        // button with bootstrap-type and bootstrap-size
+        $button = $this->Form->button('Test', [
+            'bootstrap-type' => 'success',
+            'bootstrap-size' => 'sm'
+        ]);
+        $this->assertHtml([
+            ['button' => [
+                'class' => 'btn btn-success btn-sm',
+                'type' => 'submit'
+            ]], 'Test', '/button'
+        ], $button);
+        // button with class
+        $button = $this->Form->button('Test', [
+            'class' => 'btn btn-primary'
+        ]);
+        $this->assertHtml([
+            ['button' => [
+                'class' => 'btn btn-primary',
+                'type' => 'submit'
+            ]], 'Test', '/button'
+        ], $button);
+    }
+
     protected function _testInput ($expected, $fieldName, $options = []) {
         $formOptions = [] ;
         if (isset($options['_formOptions'])) {