Skip to content

Commit 053de04

Browse files
authored
Merge pull request #2535 from jwensley2/9.0
Fix PHP8 error, method exists now throws an exception if the first ar…
2 parents 7e45885 + 14f6a7f commit 053de04

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Utilities/Helper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ public static function getOrMethod($method)
157157
*/
158158
public static function convertToArray($row, $filters = [])
159159
{
160-
$row = method_exists($row, 'makeHidden') ? $row->makeHidden(Arr::get($filters, 'hidden', [])) : $row;
161-
$row = method_exists($row, 'makeVisible') ? $row->makeVisible(Arr::get($filters, 'visible', [])) : $row;
160+
$row = is_object($row) && method_exists($row, 'makeHidden') ? $row->makeHidden(Arr::get($filters, 'hidden', [])) : $row;
161+
$row = is_object($row) && method_exists($row, 'makeVisible') ? $row->makeVisible(Arr::get($filters, 'visible', [])) : $row;
162162
$data = $row instanceof Arrayable ? $row->toArray() : (array) $row;
163163

164164
foreach ($data as &$value) {

0 commit comments

Comments
 (0)