Merge branch 'hotfix/v5.8.4'

Author: yajra

change-log.md

@@ -8,6 +8,9 @@
 
 ##Change Log
 
+###v5.8.4
+    - Fix html builder merging of column attributes.
+
 ###v5.8.3
     - Added space when setting html builder table attributes.
     - Set a default data value when adding a column.

src/yajra/Datatables/Html/Builder.php

@@ -165,7 +165,7 @@ public function columns(array $columns)
     {
         foreach ($columns as $key => $value) {
             if (is_array($value)) {
-                $attributes = ['name' => $key, 'data' => $key] + $this->setTitle($key, $value);
+                $attributes = array_merge(['name' => $key, 'data' => $key], $this->setTitle($key, $value));
             } else {
                 $attributes = [
                     'name'  => $value,