Skip to content

Commit a547c86

Browse files
committed
allow Laravel 12 for laster + support php8.4
1 parent dcd86fa commit a547c86

File tree

3 files changed

+1136
-1565
lines changed

3 files changed

+1136
-1565
lines changed

.github/workflows/CI.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
2020
steps:
2121
- name: Cancel Previous Runs
22-
uses: styfle/[email protected]
23-
with:
22+
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
23+
with:
2424
access_token: ${{ github.token }}
2525

2626
php_syntax_errors:
@@ -30,15 +30,15 @@ jobs:
3030
- kill_previous
3131
steps:
3232
- name: Set up PHP
33-
uses: shivammathur/setup-php@v2
33+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # 2.32.0
3434
with:
35-
php-version: 8.2
35+
php-version: 8.3
3636

3737
- name: Checkout code
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3939

4040
- name: Install dependencies
41-
uses: ramsey/composer-install@v3
41+
uses: ramsey/composer-install@a2636af0004d1c0499ffca16ac0b4cc94df70565 # 3.1.0
4242

4343
- name: Check source code for syntax errors
4444
run: vendor/bin/parallel-lint --exclude .git --exclude vendor .
@@ -50,15 +50,15 @@ jobs:
5050
- php_syntax_errors
5151
steps:
5252
- name: Set up PHP
53-
uses: shivammathur/setup-php@v2
53+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # 2.32.0
5454
with:
5555
php-version: latest
5656

5757
- name: Checkout code
58-
uses: actions/checkout@v4
58+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5959

6060
- name: Install dependencies
61-
uses: ramsey/composer-install@v3
61+
uses: ramsey/composer-install@a2636af0004d1c0499ffca16ac0b4cc94df70565 # 3.1.0
6262

6363
- name: Check source code for code style errors
6464
run: PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --verbose --diff --dry-run
@@ -70,17 +70,17 @@ jobs:
7070
# - php_syntax_errors
7171
# steps:
7272
# - name: Checkout code
73-
# uses: actions/checkout@v4
73+
# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7474

7575
# - name: Setup PHP
76-
# uses: shivammathur/setup-php@v2
76+
# uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # 2.32.0
7777
# with:
7878
# php-version: 8.1
7979
# coverage: none
8080
# tools: phpstan
8181

8282
# - name: Install Composer dependencies
83-
# uses: ramsey/composer-install@v3
83+
# uses: ramsey/composer-install@a2636af0004d1c0499ffca16ac0b4cc94df70565 # 3.1.0
8484

8585
# - name: Run PHPStan
8686
# run: vendor/bin/phpstan analyze
@@ -94,8 +94,8 @@ jobs:
9494
fail-fast: false
9595
matrix:
9696
php-version:
97-
- 8.2
9897
- 8.3
98+
- 8.4
9999

100100
env:
101101
COMPOSER_NO_INTERACTION: 1
@@ -106,19 +106,19 @@ jobs:
106106

107107
# Checks out a copy of your repository on the ubuntu machine
108108
- name: Checkout code
109-
uses: actions/checkout@v4
109+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
110110

111111

112112
- name: Setup PHP Action
113-
uses: shivammathur/setup-php@v2
113+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # 2.32.0
114114
with:
115115
php-version: ${{ matrix.php-version }}
116116
extensions: ${{ env.extensions }}
117117
coverage: xdebug
118118
tools: pecl, composer
119119

120120
- name: Install Composer dependencies
121-
uses: ramsey/composer-install@v3
121+
uses: ramsey/composer-install@a2636af0004d1c0499ffca16ac0b4cc94df70565 # 3.1.0
122122

123123
- name: Run tests
124124
run: composer run-tests

composer.json

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
}
2323
],
2424
"require": {
25-
"php": "^8.2",
26-
"illuminate/support": "^11.0",
27-
"illuminate/database": "^11.0",
28-
"illuminate/events": "^11.0"
25+
"php": "^8.3",
26+
"illuminate/support": "^11.0|^12.0",
27+
"illuminate/database": "^11.0|^12.0",
28+
"illuminate/events": "^11.0|^12.0"
2929
},
3030
"require-dev": {
3131
"friendsofphp/php-cs-fixer": "^3.3",
3232
"php-parallel-lint/php-parallel-lint": "^1.2",
3333
"phpunit/phpunit": "^10.5",
34-
"lychee-org/phpstan-lychee": "^1.0.4",
35-
"larastan/larastan": "^2.0",
34+
"lychee-org/phpstan-lychee": "^2.0.1",
35+
"larastan/larastan": "^3.2",
3636
"orchestra/testbench": "^9.0"
3737
},
3838
"autoload": {
@@ -55,7 +55,7 @@
5555
],
5656
"format": [
5757
"rm .php_cs.cache 2> /dev/null || true",
58-
"vendor/bin/php-cs-fixer fix -v --config=.php-cs-fixer.php"
58+
"PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix -v --config=.php-cs-fixer.php"
5959
],
6060
"phpstan": [
6161
"vendor/bin/phpstan analyze"
@@ -65,16 +65,13 @@
6565
"prefer-stable": true,
6666
"config": {
6767
"platform": {
68-
"php": "8.2"
68+
"php": "8.3"
6969
},
7070
"preferred-install": "dist",
7171
"sort-packages": true,
7272
"optimize-autoloader": true
7373
},
7474
"extra": {
75-
"branch-alias": {
76-
"dev-master": "v8.0.x-dev"
77-
},
7875
"laravel": {
7976
"providers": [
8077
"Kalnoy\\Nestedset\\NestedSetServiceProvider"

0 commit comments

Comments
 (0)