TravisCI

Arkhas · Arkhas · commit ba1c392ea4a5 · 2019-05-09T15:16:10.000+02:00
diff --git a/src/DataTableAbstract.php b/src/DataTableAbstract.php
@@ -254,7 +254,7 @@ public function escapeColumns($columns = '*')
      */
     public function makeHidden(array $attributes = [])
     {
-        $this->columnDef['make_hidden'] = array_merge_recursive($this->columnDef['make_hidden'] ?: [], $attributes);
+        $this->columnDef['make_hidden'] = array_merge_recursive(array_get($this->columnDef, 'make_hidden', []), $attributes);
 
         return $this;
     }
diff --git a/src/Utilities/Helper.php b/src/Utilities/Helper.php
@@ -156,7 +156,7 @@ public static function getOrMethod($method)
      */
     public static function convertToArray($row, $filters = [])
     {
-        $row  = method_exists($row, 'makeHidden') ? $row->makeHidden($filters['make_hidden']) : $row;
+        $row  = method_exists($row, 'makeHidden') ? $row->makeHidden(array_get($filters, 'make_hidden', [])) : $row;
         $data = $row instanceof Arrayable ? $row->toArray() : (array) $row;
 
         foreach ($data as &$value) {

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ public function escapeColumns($columns = '*')`
`254`	`254`	`*/`
`255`	`255`	`public function makeHidden(array $attributes = [])`
`256`	`256`	`{`
`257`		`- $this->columnDef['make_hidden'] = array_merge_recursive($this->columnDef['make_hidden'] ?: [], $attributes);`
	`257`	`+ $this->columnDef['make_hidden'] = array_merge_recursive(array_get($this->columnDef, 'make_hidden', []), $attributes);`
`258`	`258`
`259`	`259`	`return $this;`
`260`	`260`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public static function getOrMethod($method)`
`156`	`156`	`*/`
`157`	`157`	`public static function convertToArray($row, $filters = [])`
`158`	`158`	`{`
`159`		`- $row = method_exists($row, 'makeHidden') ? $row->makeHidden($filters['make_hidden']) : $row;`
	`159`	`+ $row = method_exists($row, 'makeHidden') ? $row->makeHidden(array_get($filters, 'make_hidden', [])) : $row;`
`160`	`160`	`$data = $row instanceof Arrayable ? $row->toArray() : (array) $row;`
`161`	`161`
`162`	`162`	`foreach ($data as &$value) {`