Changes

- Change param to query
- Fix psalm errors

Author: rappasoft

src/DataTableComponent.php

@@ -194,11 +194,11 @@ public function render()
     /**
      * Get a column object by its field
      *
-     * @param $column
+     * @param  string  $column
      *
      * @return mixed
      */
-    protected function getColumn($column)
+    protected function getColumn(string $column)
     {
         return collect($this->columns())
             ->where('column', $column)

src/Traits/WithSorting.php

@@ -31,7 +31,7 @@ public function applySorting(Builder $query): Builder
     {
         foreach ($this->sorts as $field => $direction) {
             if (optional($this->getColumn($field))->hasSortCallback()) {
-                $query = app()->call($this->getColumn($field)->getSortCallback(), ['builder' => $query, 'direction' => $direction]);
+                $query = app()->call($this->getColumn($field)->getSortCallback(), ['query' => $query, 'direction' => $direction]);
             } else {
                 $query->orderBy($field, $direction);
             }

src/Views/Column.php

@@ -25,7 +25,7 @@ class Column
     public bool $sortable = false;
 
     /**
-     * @var null
+     * @var
      */
     public $sortCallback;
 
@@ -108,13 +108,11 @@ public function isBlank(): bool
     /**
      * @return $this
      */
-    public function sortable(callable $callback = null): self
+    public function sortable($callback = null): self
     {
         $this->sortable = true;
 
-        if ($callback) {
-            $this->sortCallback = $callback;
-        }
+        $this->sortCallback = $callback;
 
         return $this;
     }