Merge pull request #2606 from schonhoff/9.0

Code cleanup in QueryDataTable class

Author: yajra

src/QueryDataTable.php

@@ -304,7 +304,7 @@ public function columnSearch()
             }
 
             if ($this->hasFilterColumn($column)) {
-                $keyword = $this->getColumnSearchKeyword($index, $raw = true);
+                $keyword = $this->getColumnSearchKeyword($index, true);
                 $this->applyFilterColumn($this->getBaseQueryBuilder(), $column, $keyword);
             } else {
                 $column  = $this->resolveRelationColumn($column);
@@ -567,7 +567,7 @@ public function orderColumns(array $columns, $sql, $bindings = [])
      * Override default column ordering.
      *
      * @param string $column
-     * @param string $sql
+     * @param string|\Closure $sql
      * @param array  $bindings
      * @return $this
      * @internal string $1 Special variable that returns the requested order direction of the column.
@@ -761,7 +761,7 @@ protected function globalSearch($keyword)
     protected function showDebugger(array $output)
     {
         $query_log = $this->connection->getQueryLog();
-        array_walk_recursive($query_log, function (&$item, $key) {
+        array_walk_recursive($query_log, function (&$item) {
             $item = utf8_encode($item);
         });