Update the addClass method to remove duplicate classes.

Author: Holt59

src/View/Helper/BootstrapTrait.php

@@ -41,21 +41,21 @@ trait BootstrapTrait {
      * @return array Array of options with $key set.
      */
     public function addClass(array $options = [], $class = null, $key = 'class') {
-        if (is_array($class)) {
-            $class = implode(' ', array_unique(array_map('trim', $class))) ;
+        if (!is_array($class)) {
+            $class = explode(' ', trim($class));
         }
+        $optClass = [];
         if (isset($options[$key])) {
             $optClass = $options[$key];
-            if (is_array($optClass)) {
-                $optClass = trim(implode(' ', array_unique(array_map('trim', $optClass))));
+            if (!is_array($optClass)) {
+                $optClass = explode(' ', trim($optClass));
             }
         }
-        if (isset($optClass) && $optClass) {
-            $options[$key] = $optClass.' '.$class ;
-        }
-        else {
-            $options[$key] = $class ;
-        }
+        $class = array_merge($optClass, $class);
+        $class = array_map('trim', $class);
+        $class = array_unique($class);
+        $class = array_filter($class);
+        $options[$key] = implode(' ', $class);
         return $options ;
     }
 

tests/TestCase/View/Helper/BootstrapTraitTest.php

@@ -52,7 +52,23 @@ public function tearDown() {
         unset($this->Form);
         unset($this->Paginator);
     }
-        
+
+    public function testAddClass() {
+        // Test with a string
+        $opts = [
+            'class' => 'class-1'
+        ];
+        $opts = $this->_Trait->addClass($opts, '  class-1    class-2  ');
+        $this->assertEquals($opts, [
+            'class' => 'class-1 class-2'
+        ]);
+        // Test with an array
+        $opts = $this->_Trait->addClass($opts, ['class-1', 'class-3']);
+        $this->assertEquals($opts, [
+            'class' => 'class-1 class-2 class-3'
+        ]);
+    }
+
     public function testEasyIcon() {
 
         $that = $this;