Merge branch 'release/v5.9.2'

Author: yajra

change-log.md

@@ -8,6 +8,10 @@
 
 ##Change Log
 
+###v5.9.2
+    - Fix possible error when rendering table and overriding the attributes.
+    - Merge DT parameters.
+
 ###v5.9.1
     - Fix default ajax value causing js data null error.
 

src/yajra/Datatables/Html/Builder.php

@@ -275,7 +275,7 @@ public function ajax($attributes)
      */
     public function table(array $attributes = [])
     {
-        $this->tableAttributes = $attributes ?: $this->tableAttributes;
+        $this->tableAttributes = array_merge($this->tableAttributes, $attributes);
 
         return '<table ' . $this->html->attributes($this->tableAttributes) . '></table>';
     }
@@ -288,7 +288,7 @@ public function table(array $attributes = [])
      */
     public function parameters(array $attributes = [])
     {
-        $this->attributes = $attributes;
+        $this->attributes = array_merge($this->attributes, $attributes);
 
         return $this;
     }