Skip to content

Commit 10f7896

Browse files
committed
Fix stan
1 parent 677ebeb commit 10f7896

File tree

2 files changed

+10
-26
lines changed

2 files changed

+10
-26
lines changed

src/ApiResourceDataTable.php

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,6 @@
88

99
class ApiResourceDataTable extends CollectionDataTable
1010
{
11-
/**
12-
* Collection object.
13-
*
14-
* @var \Illuminate\Http\Resources\Json\AnonymousResourceCollection
15-
*/
16-
public $collection;
17-
18-
/**
19-
* Collection object.
20-
*
21-
* @var \Illuminate\Http\Resources\Json\AnonymousResourceCollection
22-
*/
23-
public $original;
24-
2511
/**
2612
* Can the DataTable engine be created with these parameters.
2713
*
@@ -36,7 +22,7 @@ public static function canCreate($source)
3622
/**
3723
* Factory method, create and return an instance for the DataTable engine.
3824
*
39-
* @param \Illuminate\Http\Resources\Json\AnonymousResourceCollection $source
25+
* @param \Illuminate\Http\Resources\Json\AnonymousResourceCollection<array-key, array>|array $source
4026
* @return ApiResourceDataTable|DataTableAbstract
4127
*/
4228
public static function create($source)
@@ -47,17 +33,14 @@ public static function create($source)
4733
/**
4834
* CollectionEngine constructor.
4935
*
50-
* @param \Illuminate\Http\Resources\Json\AnonymousResourceCollection $collection
36+
* @param \Illuminate\Http\Resources\Json\AnonymousResourceCollection<array-key, array> $collection
5137
*/
5238
public function __construct(AnonymousResourceCollection $collection)
5339
{
5440
$this->request = app('datatables.request');
5541
$this->config = app('datatables.config');
56-
$this->collection = collect($collection->toArray($this->request));
57-
$this->original = $collection;
58-
$this->columns = array_keys($this->serialize(collect($collection->toArray($this->request))->first()));
59-
if ($collection->resource instanceof LengthAwarePaginator) {
60-
$this->isFilterApplied = true;
61-
}
42+
$this->collection = collect($collection);
43+
$this->original = collect($collection);
44+
$this->columns = array_keys($this->serialize(collect($collection)->first()));
6245
}
63-
}
46+
}

src/CollectionDataTable.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Exception;
77
use Illuminate\Contracts\Support\Arrayable;
88
use Illuminate\Http\JsonResponse;
9+
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
910
use Illuminate\Support\Arr;
1011
use Illuminate\Support\Collection;
1112
use Illuminate\Support\Str;
@@ -17,14 +18,14 @@ class CollectionDataTable extends DataTableAbstract
1718
*
1819
* @var \Illuminate\Support\Collection<array-key, array>
1920
*/
20-
public $collection;
21+
public Collection $collection;
2122

2223
/**
2324
* Collection object.
2425
*
2526
* @var \Illuminate\Support\Collection<array-key, array>
2627
*/
27-
public $original;
28+
public Collection $original;
2829

2930
/**
3031
* The offset of the first record in the full dataset.
@@ -72,7 +73,7 @@ public static function canCreate($source)
7273
/**
7374
* Factory method, create and return an instance for the DataTable engine.
7475
*
75-
* @param array|\Illuminate\Support\Collection<array-key, array> $source
76+
* @param AnonymousResourceCollection|array|\Illuminate\Support\Collection<array-key, array> $source
7677
* @return static
7778
*/
7879
public static function create($source)

0 commit comments

Comments
 (0)