Skip to content

Commit 4b6c488

Browse files
authored
Merge pull request #1 from AuroraWebSoftware/laravel-12-upgrade
Laravel 12 upgrade
2 parents 6503dfc + 975b13c commit 4b6c488

File tree

3 files changed

+24
-28
lines changed

3 files changed

+24
-28
lines changed

.github/workflows/run-tests.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,14 @@ jobs:
1717
fail-fast: true
1818
matrix:
1919
os: [ubuntu-latest]
20-
php: [8.3, 8.2]
21-
laravel: [11.*, 10.*]
20+
php: [ 8.4,8.3, 8.2 ]
21+
laravel: [ 12.*]
2222
stability: [prefer-lowest, prefer-stable]
2323
include:
24-
- laravel: 11.*
25-
testbench: 9.*
26-
carbon: ^2.63
27-
- laravel: 10.*
28-
testbench: 8.*
29-
carbon: ^2.63
24+
- laravel: 12.*
25+
testbench: 10.*
26+
carbon: ^3
27+
3028

3129
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
3230

.github/workflows/run-tests2.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,14 @@ jobs:
1717
fail-fast: true
1818
matrix:
1919
os: [ubuntu-latest]
20-
php: [8.3, 8.2]
21-
laravel: [11.*, 10.*]
20+
php: [ 8.4,8.3, 8.2 ]
21+
laravel: [ 12.*]
2222
stability: [prefer-lowest, prefer-stable]
2323
include:
24-
- laravel: 11.*
25-
testbench: 9.*
26-
carbon: ^2.63
27-
- laravel: 10.*
28-
testbench: 8.*
29-
carbon: ^2.63
24+
- laravel: 12.*
25+
testbench: 10.*
26+
carbon: ^3
27+
3028

3129
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
3230

composer.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^8.2",
20-
"aurorawebsoftware/flexyfield": "^1.6.3",
21-
"illuminate/contracts": "^10.0||^11.0",
19+
"php": "^8.2|^8.3|^8.4",
20+
"aurorawebsoftware/flexyfield": "^12.0",
21+
"illuminate/contracts": "^10.0||^11.0||^12.0",
2222
"spatie/laravel-package-tools": "^1.16"
2323
},
2424
"require-dev": {
2525
"laradumps/laradumps-core": "^2.0",
26-
"larastan/larastan": "^2.9",
26+
"larastan/larastan": "^3",
2727
"laravel/pint": "^1.14",
28-
"nunomaduro/collision": "^8.1.1||^7.10.0",
29-
"orchestra/testbench": "^9.0.0||^8.22.0",
30-
"pestphp/pest": "^2.34",
31-
"pestphp/pest-plugin-arch": "^2.7",
32-
"pestphp/pest-plugin-laravel": "^2.3",
33-
"phpstan/extension-installer": "^1.3",
34-
"phpstan/phpstan-deprecation-rules": "^1.1",
35-
"phpstan/phpstan-phpunit": "^1.3"
28+
"nunomaduro/collision": "^7 || ^8",
29+
"orchestra/testbench": "^10.0 || ^9.0.0 || ^8.22.0",
30+
"pestphp/pest": "^2.34 || ^3.0",
31+
"pestphp/pest-plugin-arch": "^2 || ^3",
32+
"pestphp/pest-plugin-laravel": "^2.34 || ^3.0",
33+
"phpstan/extension-installer": "^1",
34+
"phpstan/phpstan-deprecation-rules": "^2",
35+
"phpstan/phpstan-phpunit": "^2"
3636
},
3737
"autoload": {
3838
"psr-4": {

0 commit comments

Comments
 (0)