Merge pull request #2931 from Naugrimm/php8.1-compat

fix: prevent deprecation errors in php 8.1+
yajra · Jan 11, 2023 · 87f8f19 · 87f8f19
2 parents 314f0db + 3d8162d
commit 87f8f19
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/DataTableAbstract.php b/src/DataTableAbstract.php
@@ -145,6 +145,8 @@ abstract class DataTableAbstract implements DataTable
      */
     protected array $searchPanes = [];
 
+    protected mixed $transformer;
+
     /**
      * Can the DataTable engine be created with these parameters.
      *

diff --git a/src/QueryDataTable.php b/src/QueryDataTable.php
@@ -735,7 +735,7 @@ protected function showDebugger(array $output): array
         $query_log = $this->getConnection()->getQueryLog();
         array_walk_recursive($query_log, function (&$item) {
             if (is_string($item)) {
-                $item = utf8_encode($item);
+                $item = iconv('iso-8859-1', 'utf-8', $item);
             }
         });