Skip to content

Commit 3ddbf8e

Browse files
authored
Merge pull request #145 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents 2c20d23 + 3bce79d commit 3ddbf8e

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
name: PHP Stan and Tests
22

3-
on: [push]
3+
on:
4+
- push
45

56
jobs:
67
stan-and-tests:
78
strategy:
89
matrix:
910
php: [8.1, 8.2]
10-
laravel: [^10.15]
11+
laravel: ['12.0', ^10.15]
12+
exclude:
13+
- laravel: '12.0'
14+
php: 8.1
1115

1216
name: PHP ${{ matrix.php }} / Laravel ${{ matrix.laravel }}
1317

@@ -41,6 +45,3 @@ jobs:
4145

4246
- name: PHP Tests
4347
run: composer test
44-
45-
46-

composer.json

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,28 @@
1010
}
1111
],
1212
"homepage": "https://github.com/laravel-backpack/basset",
13-
"keywords": ["Laravel", "Basset", "Assets", "Load CSS once", "Load JS once"],
13+
"keywords": [
14+
"Laravel",
15+
"Basset",
16+
"Assets",
17+
"Load CSS once",
18+
"Load JS once"
19+
],
1420
"scripts": {
1521
"test": "./vendor/bin/pest",
1622
"analyse": "./vendor/bin/phpstan analyse --level 5 src"
1723
},
1824
"require": {
19-
"laravel/framework": "^10.15|^11",
25+
"laravel/framework": "^10.15|^11|^12.0",
2026
"guzzlehttp/guzzle": "^7.5"
2127
},
2228
"require-dev": {
23-
"phpunit/phpunit": "~9.0|~10.0",
29+
"phpunit/phpunit": "~9.0|~10.0|^11.5.3",
2430
"nunomaduro/collision": "^6.0|^7.2",
25-
"pestphp/pest": "^1.22|^2.5",
26-
"pestphp/pest-plugin-laravel": "^1.4|^2.0",
27-
"orchestra/testbench": "^7.22|^8.5",
28-
"phpstan/phpstan": "^1.10"
31+
"pestphp/pest": "^1.22|^2.5|^3.7",
32+
"pestphp/pest-plugin-laravel": "^1.4|^2.0|^3.1",
33+
"orchestra/testbench": "^7.22|^8.5|^10.0",
34+
"phpstan/phpstan": "^1.10|^2.1"
2935
},
3036
"suggest": {
3137
"ext-zip": "Required to use @bassetArchive with .zip archives."

0 commit comments

Comments
 (0)