Skip to content

Commit 07f8ae4

Browse files
authoredMar 20, 2024
Merge pull request #4 from worksome/feature/laravel-11
feat: add support for Laravel 11
2 parents 015dc6f + 601be54 commit 07f8ae4

File tree

8 files changed

+24
-39
lines changed

8 files changed

+24
-39
lines changed
 

‎.github/workflows/static.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: PHPStan
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2

‎.github/workflows/tests.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,20 @@ jobs:
1515
fail-fast: true
1616
matrix:
1717
os: [ubuntu-latest]
18-
php: [8.2]
19-
laravel: [10.*]
20-
stability: [prefer-lowest, prefer-stable]
18+
php: [8.2, 8.3]
19+
laravel: [10.*, 11.*]
20+
stability: [prefer-stable]
2121
include:
2222
- laravel: 10.*
2323
testbench: 8.*
24+
- laravel: 11.*
25+
testbench: 9.*
2426

2527
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2628

2729
steps:
2830
- name: Checkout code
29-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3032

3133
- name: Setup PHP
3234
uses: shivammathur/setup-php@v2

‎CHANGELOG.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ composer test
5656

5757
## Changelog
5858

59-
Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed recently.
59+
Please see [GitHub Releases](https://github.com/worksome/laravel-filters/releases) for more information on what has changed recently.
6060

6161
## Contributing
6262

‎RELEASE.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
],
1818
"require": {
1919
"php": "^8.2",
20-
"illuminate/contracts": "^10.0",
21-
"illuminate/database": "^10.0",
22-
"spatie/laravel-package-tools": "^1.14.1",
23-
"tucker-eric/eloquentfilter": "^3.2"
20+
"illuminate/contracts": "^10.0 || ^11.0",
21+
"illuminate/database": "^10.0 || ^11.0",
22+
"spatie/laravel-package-tools": "^1.16",
23+
"tucker-eric/eloquentfilter": "^3.3"
2424
},
2525
"require-dev": {
2626
"ext-pdo": "*",
27-
"nunomaduro/collision": "^7.0",
28-
"nunomaduro/larastan": "^2.4.0",
29-
"orchestra/testbench": "^8.0",
30-
"pestphp/pest": "^2.0",
31-
"pestphp/pest-plugin-laravel": "^2.0",
32-
"worksome/coding-style": "^2.5"
27+
"nunomaduro/collision": "^7.10 || ^8.1",
28+
"larastan/larastan": "^2.6",
29+
"orchestra/testbench": "^8.21 || ^9.0",
30+
"pestphp/pest": "^2.33",
31+
"pestphp/pest-plugin-laravel": "^2.2",
32+
"worksome/coding-style": "^2.8"
3333
},
3434
"autoload": {
3535
"psr-4": {

‎src/FilterQuery.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function __construct(Repository $config)
4444
}
4545

4646
/**
47-
* @param class-string<TModel> $modelClass
47+
* @param class-string<TModel> $modelClass
4848
*
4949
* @return self<TModel, TFilter>
5050
*/
@@ -57,7 +57,7 @@ public function model(string $modelClass): self
5757
}
5858

5959
/**
60-
* @param class-string<TFilter> $filterClass
60+
* @param class-string<TFilter> $filterClass
6161
*
6262
* @return self<TModel, TFilter>
6363
*/
@@ -73,7 +73,7 @@ public function apply(string $filterClass): self
7373
}
7474

7575
/**
76-
* @param array<string, mixed> $input
76+
* @param array<string, mixed> $input
7777
*
7878
* @return self<TModel, TFilter>
7979
*/
@@ -85,7 +85,7 @@ public function input(array $input = []): self
8585
}
8686

8787
/**
88-
* @param Builder<TModel> $query
88+
* @param Builder<TModel> $query
8989
*
9090
* @return self<TModel, TFilter>
9191
*/
@@ -119,7 +119,7 @@ public function get(): Collection
119119
}
120120

121121
/**
122-
* @param array<string> $columns
122+
* @param array<string> $columns
123123
*
124124
* @return LengthAwarePaginator<TModel>
125125
*
@@ -140,7 +140,7 @@ public function paginateFilter(
140140
}
141141

142142
/**
143-
* @param array<int, string> $columns
143+
* @param array<int, string> $columns
144144
*
145145
* @return Paginator<TModel>
146146
*

‎src/ModelFilter.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Worksome\Filters;
66

77
use EloquentFilter\ModelFilter as BaseModelFilter;
8-
use Illuminate\Database\Eloquent\SoftDeletes;
98
use Illuminate\Support\Str;
109

1110
/**

0 commit comments

Comments
 (0)
Please sign in to comment.