Skip to content

Commit 87f8f19

Browse files
authored
Merge pull request #2931 from Naugrimm/php8.1-compat
fix: prevent deprecation errors in php 8.1+
2 parents 314f0db + 3d8162d commit 87f8f19

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/DataTableAbstract.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ abstract class DataTableAbstract implements DataTable
145145
*/
146146
protected array $searchPanes = [];
147147

148+
protected mixed $transformer;
149+
148150
/**
149151
* Can the DataTable engine be created with these parameters.
150152
*

src/QueryDataTable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ protected function showDebugger(array $output): array
735735
$query_log = $this->getConnection()->getQueryLog();
736736
array_walk_recursive($query_log, function (&$item) {
737737
if (is_string($item)) {
738-
$item = utf8_encode($item);
738+
$item = iconv('iso-8859-1', 'utf-8', $item);
739739
}
740740
});
741741

0 commit comments

Comments
 (0)