Skip to content

Commit 9841a74

Browse files
Merge pull request #22 from devaction-labs/fix/version-composer
docs: update README and add PHPDoc for filterable trait
2 parents 27f4748 + d7b421a commit 9841a74

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ class ProductController extends Controller
308308
// Apply pagination with custom parameters
309309
->customPaginate(false, [
310310
'per_page' => $request->input('per_page', 15),
311-
'sort' => $request->input('sort', '-created_at'),
311+
'sort' => $request->input('sort', '-created_at'),===========fffdfdfsdddddddddddsdsdsdsads
312312
]);
313313

314314
return response()->json($products);

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"email": "alex@devaction.com.br"
1010
}
1111
],
12-
"version": "1.0.22",
12+
"version": "1.0.23",
1313
"require": {
1414
"php": "^8.2|^8.3|^8.4",
1515
"illuminate/cache": "^11|^12",

src/Traits/Filterable.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
88
use Illuminate\Contracts\Pagination\Paginator;
99
use Illuminate\Database\Eloquent\Builder;
10+
use Illuminate\Database\Query\Expression;
1011
use Illuminate\Support\Facades\DB;
1112
use InvalidArgumentException;
1213
use JsonException;
@@ -58,6 +59,9 @@ public function scopeFiltrable(Builder $builder, array $filters): Builder
5859
return $this->scopeFilterable($builder, $filters);
5960
}
6061

62+
/**
63+
* @throws JsonException
64+
*/
6165
public function scopeFilterable(Builder $builder, array $filters): Builder
6266
{
6367
[$relationshipFilters, $directFilters, $relationshipsToLoad] = $this->categorizeFilters($filters);
@@ -394,7 +398,7 @@ private function hasJsonPath(Filter $filter): bool
394398
/**
395399
* Apply a filter to a builder
396400
*/
397-
private function applyFilterToBuilder(Builder $builder, Filter $filter, string $attribute, mixed $value): void
401+
private function applyFilterToBuilder(Builder $builder, Filter $filter, string|Expression $attribute, mixed $value): void
398402
{
399403
if ($filter->getOperator() === 'IN') {
400404
$builder->whereIn($attribute, $value);

0 commit comments

Comments
 (0)