Skip to content

Commit e3e57f7

Browse files
authored
Feature | PHP 8.5 Support (#67)
* php 8.5 * add pest v2 * exlude l10 php85 * exlude l11 php85 * composer update * fix composer update * update checkout * update dependencies * update dependencies * no longer support laravel 10 * no longer support laravel 10 * remove exclude * update dependencies * update dependencies * remove prefer lowest * actions checkout * update dependencies
1 parent 29c2720 commit e3e57f7

File tree

4 files changed

+34
-29
lines changed

4 files changed

+34
-29
lines changed

.github/workflows/php-cs-fixer.yml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,31 @@ on:
1313
permissions:
1414
contents: write
1515

16+
concurrency:
17+
group: ${{ github.head_ref || github.ref || github.run_id }}_php_cs_fixer
18+
cancel-in-progress: true
19+
1620
jobs:
17-
php-cs-fixer:
21+
lint:
1822
runs-on: ubuntu-latest
19-
2023
steps:
21-
- name: Checkout code
22-
uses: actions/checkout@v3
23-
- name: Run PHP CS Fixer
24-
uses: docker://oskarstark/php-cs-fixer-ga
24+
- uses: actions/checkout@v6
25+
26+
- name: Setup PHP
27+
uses: shivammathur/setup-php@v2
2528
with:
26-
args: --config=.php-cs-fixer.dist.php --allow-risky=yes
27-
- name: Commit changes
28-
uses: stefanzweifel/git-auto-commit-action@v4
29+
php-version: '8.2'
30+
31+
- name: Install Dependencies
32+
run: |
33+
composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
34+
35+
- name: Run PHP CS Fixer
36+
run: ./vendor/bin/php-cs-fixer fix --allow-risky=yes
37+
38+
- name: Commit Changes
39+
uses: stefanzweifel/git-auto-commit-action@v5
2940
with:
3041
commit_message: 🪄 Code Style Fixes
42+
commit_options: '--no-verify'
43+

.github/workflows/phpstan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
name: phpstan
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v6
1919

2020
- name: Setup PHP
2121
uses: shivammathur/setup-php@v2
2222
with:
23-
php-version: '8.3'
23+
php-version: '8.5'
2424
coverage: none
2525

2626
- name: Install composer dependencies

.github/workflows/tests.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,20 @@ jobs:
2121
fail-fast: true
2222
matrix:
2323
os: [ ubuntu-latest, windows-latest ]
24-
php: [ 8.1, 8.2, 8.3 ]
25-
laravel: [ '10.*', '11.*', '12.*' ]
24+
php: [ 8.2, 8.3, 8.4, 8.5 ]
25+
laravel: [ '11.*', '12.*' ]
2626
stability: [ prefer-lowest, prefer-stable ]
2727
include:
28-
- laravel: 10.*
29-
testbench: 8.*
3028
- laravel: 11.*
3129
testbench: 9.*
3230
- laravel: 12.*
3331
testbench: 10.*
34-
exclude:
35-
- laravel: 11.*
36-
php: 8.1
37-
- laravel: 12.*
38-
php: 8.1
3932

4033
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
4134

4235
steps:
4336
- name: Checkout code
44-
uses: actions/checkout@v3
37+
uses: actions/checkout@v6
4538

4639
- name: Setup PHP
4740
uses: shivammathur/setup-php@v2
@@ -57,8 +50,7 @@ jobs:
5750
5851
- name: Install dependencies
5952
run: |
60-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
61-
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
53+
composer update --${{ matrix.stability }} --with=laravel/framework:${{ matrix.laravel }} --with=orchestra/testbench-core:${{ matrix.testbench }} --prefer-dist --no-interaction
6254
6355
- name: Execute tests
6456
run: vendor/bin/pest

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
],
2020
"homepage": "https://github.com/saloonphp/laravel-plugin",
2121
"require": {
22-
"php": "^8.1",
23-
"illuminate/console": "^10.0 || ^11.0 || ^12.0",
24-
"illuminate/support": "^10.0 || ^11.0 || ^12.0",
22+
"php": "^8.2",
23+
"illuminate/console": "^11.0 || ^v12.39.0",
24+
"illuminate/support": "^11.0 || ^12.39.0",
2525
"saloonphp/saloon": "^3.5",
2626
"symfony/finder": "^6.4 || ^7.0"
2727
},
2828
"require-dev": {
2929
"friendsofphp/php-cs-fixer": "^3.48",
30-
"orchestra/testbench": "^8.21 || ^9.0 || ^10.0",
31-
"pestphp/pest": "^2.32 || ^3.7",
32-
"phpstan/phpstan": "^1.10.56 || ^2.1"
30+
"orchestra/testbench": "^9.15 || ^10.7",
31+
"pestphp/pest": "^3.0|^4.0",
32+
"phpstan/phpstan": "^1.10.57|^2.0.2"
3333
},
3434
"minimum-stability": "stable",
3535
"prefer-stable": true,

0 commit comments

Comments
 (0)