Skip to content

Commit c60223b

Browse files
committed
Merge branch '2.x' of github.com:coderflexx/laravel-ticket into laravel-12-support
2 parents 5466d65 + bf6b7ea commit c60223b

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

.github/workflows/run-tests.yml

+13-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@ name: run-tests
22

33
on:
44
push:
5-
branches: [main]
5+
branches:
6+
- main
7+
- 1.x
8+
- 2.x
69
pull_request:
7-
branches: [main]
10+
branches:
11+
- main
12+
- 1.x
13+
- 2.x
814

915
jobs:
1016
test:
@@ -14,16 +20,20 @@ jobs:
1420
matrix:
1521
os: [ubuntu-latest, windows-latest]
1622
php: [8.1, 8.2]
17-
laravel: [9.*, 10.*]
23+
laravel: [9.*, 10.*, 11.*]
1824
stability: [prefer-lowest, prefer-stable]
1925
include:
2026
- laravel: 9.*
2127
testbench: 7.*
2228
- laravel: 10.*
2329
testbench: 8.*
30+
- laravel: 11.*
31+
testbench: 9.*
2432
exclude:
2533
- laravel: 9.*
2634
php: 8.2
35+
- larvel: 11.*
36+
php: 8.1
2737

2838
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2939

composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
"require": {
1919
"php": "^8.1",
2020
"spatie/laravel-package-tools": "^1.13.0",
21-
"illuminate/contracts": "^9.0|^10.0"
21+
"illuminate/contracts": "^9.0|^10.0|^11.0"
2222
},
2323
"require-dev": {
2424
"laravel/pint": "^1.0",
25-
"nunomaduro/collision": "^6.0|^7.0",
25+
"nunomaduro/collision": "^6.0|^7.0|^8.0",
2626
"nunomaduro/larastan": "^2.0.1",
27-
"orchestra/testbench": "^7.0|^8.0",
27+
"orchestra/testbench": "^7.0|^8.0|^9.0",
2828
"pestphp/pest": "^1.21",
2929
"pestphp/pest-plugin-laravel": "^1.1",
3030
"phpstan/extension-installer": "^1.1",
3131
"phpstan/phpstan-deprecation-rules": "^1.0",
3232
"phpstan/phpstan-phpunit": "^1.0",
33-
"phpunit/phpunit": "^9.5|^10.0"
33+
"phpunit/phpunit": "^9.5|^10.0|^11.0"
3434
},
3535
"autoload": {
3636
"psr-4": {
@@ -68,4 +68,4 @@
6868
},
6969
"minimum-stability": "dev",
7070
"prefer-stable": true
71-
}
71+
}

0 commit comments

Comments
 (0)