Skip to content

Commit bf84274

Browse files
authored
Merge pull request #110 from laravel-shift/l13-compatibility
Laravel 13.x Compatibility
2 parents b96fbc5 + 4cac371 commit bf84274

3 files changed

Lines changed: 29 additions & 27 deletions

File tree

.github/workflows/static.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,21 @@ on:
55
paths:
66
- '**.php'
77
- 'phpstan.neon.dist'
8+
- '.github/workflows/static.yml'
9+
pull_request:
10+
branches: [main]
811

912
jobs:
1013
phpstan:
1114
name: PHPStan
1215
runs-on: ubuntu-latest
1316
steps:
14-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1518

1619
- name: Setup PHP
1720
uses: shivammathur/setup-php@v2
1821
with:
19-
php-version: '8.3'
22+
php-version: '8.4'
2023
coverage: none
2124

2225
- name: Install composer dependencies
@@ -32,16 +35,16 @@ jobs:
3235

3336
steps:
3437
- name: Checkout
35-
uses: actions/checkout@v5
38+
uses: actions/checkout@v6
3639

3740
- name: Setup PHP
3841
uses: shivammathur/setup-php@v2
3942
with:
40-
php-version: '8.3'
43+
php-version: '8.4'
4144
coverage: none
4245

43-
- name: Install Dependencies
44-
run: composer update --prefer-dist --no-interaction --no-progress --ansi
46+
- name: Install composer dependencies
47+
uses: ramsey/composer-install@v3
4548

4649
- name: Run ECS
4750
run: composer test:style

.github/workflows/tests.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,22 @@ jobs:
1010
test:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
13-
fail-fast: true
1413
matrix:
1514
os: [ubuntu-latest]
16-
php: [8.4, 8.3]
17-
laravel: [12.*, 11.*]
15+
php: [8.4, 8.5]
16+
laravel: [12.*, 13.*]
1817
stability: [prefer-lowest, prefer-stable]
1918
include:
19+
- laravel: 13.*
20+
testbench: ^11.0
2021
- laravel: 12.*
21-
testbench: 10.*
22-
- laravel: 11.*
23-
testbench: 9.*
22+
testbench: ^10.7
2423

2524
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2625

2726
steps:
2827
- name: Checkout code
29-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
3029

3130
- name: Setup PHP
3231
uses: shivammathur/setup-php@v2

composer.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
"type": "library",
55
"license": "MIT",
66
"require": {
7-
"php": "^8.3",
7+
"php": "^8.4",
88
"guzzlehttp/guzzle": "^7.8",
9-
"illuminate/container": "^11.0 || ^12.0",
10-
"illuminate/contracts": "^11.0 || ^12.0",
11-
"illuminate/database": "^11.0 || ^12.0",
12-
"illuminate/support": "^11.0 || ^12.0",
13-
"nesbot/carbon": "^2.72 || ^3.0",
9+
"illuminate/container": "^12.0 || ^13.0",
10+
"illuminate/contracts": "^12.0 || ^13.0",
11+
"illuminate/database": "^12.0 || ^13.0",
12+
"illuminate/support": "^12.0 || ^13.0",
13+
"nesbot/carbon": "^3.0",
1414
"nuwave/lighthouse": "^6.54",
15-
"phpoffice/phpspreadsheet": "^1.29.10 || ^2.3.8",
16-
"symfony/dependency-injection": "^6.4 || ^7.0",
17-
"worksome/graphql-helpers": "^0.1.15"
15+
"phpoffice/phpspreadsheet": "^1.30 || ^2.3.8 || ^5.4",
16+
"symfony/dependency-injection": "^7.0 || ^8.0",
17+
"worksome/graphql-helpers": "^0.1.18"
1818
},
1919
"require-dev": {
20-
"larastan/larastan": "^3.1",
20+
"larastan/larastan": "^3.9",
2121
"nunomaduro/collision": "^7.10 || ^8.1.1",
22-
"orchestra/testbench": "^9.12 || ^10.1",
23-
"pestphp/pest": "^3.7",
24-
"pestphp/pest-plugin-laravel": "^3.1",
25-
"worksome/coding-style": "^3.2"
22+
"orchestra/testbench": "^10.8 || ^11.0",
23+
"pestphp/pest": "^4.4",
24+
"pestphp/pest-plugin-laravel": "^4.1",
25+
"worksome/coding-style": "^3.4"
2626
},
2727
"autoload": {
2828
"psr-4": {

0 commit comments

Comments
 (0)