Skip to content

Commit

Permalink
Merge pull request #36 from pxlrbt/fix/laravel8-compatibility
Browse files Browse the repository at this point in the history
Remove Laravel 9 type definition for query.
  • Loading branch information
pxlrbt authored Aug 23, 2022
2 parents fa99f74 + ed3c3ea commit 6e3f7a4
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/Exports/ExcelExport.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Support\Concerns\EvaluatesClosures;
use Filament\Tables\Contracts\HasTable;
use Illuminate\Contracts\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;
use Livewire\Component;
Expand Down Expand Up @@ -72,7 +71,10 @@ class ExcelExport implements HasMapping, HasHeadings, FromQuery, ShouldAutoSize,

protected ?Model $modelInstance = null;

protected ?Builder $query = null;
/**
* @var \Illuminate\Database\Eloquent\Relations\Relation|\Illuminate\Database\Query\Builder|mixed|null
*/
protected $query = null;

protected array $formSchema = [];

Expand Down Expand Up @@ -224,7 +226,10 @@ public function export()
->send();
}

public function query(): Builder
/**
* @return \Illuminate\Database\Eloquent\Relations\Relation|\Illuminate\Database\Query\Builder|mixed|null
*/
public function query()
{
$query = $this->getQuery();

Expand Down

0 comments on commit 6e3f7a4

Please sign in to comment.