Skip to content

Commit a326f34

Browse files
authored
Merge pull request #40 from saloonphp/feature/php-8.5
Feature | PHP 8.5 Support
2 parents 4711807 + b468524 commit a326f34

File tree

4 files changed

+29
-17
lines changed

4 files changed

+29
-17
lines changed

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

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,30 @@ on:
1111
permissions:
1212
contents: write
1313

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

.github/workflows/phpstan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
name: phpstan
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717

1818
- name: Setup PHP
1919
uses: shivammathur/setup-php@v2
2020
with:
21-
php-version: '8.4'
21+
php-version: '8.5'
2222
coverage: none
2323

2424
- name: Install composer dependencies

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
fail-fast: true
1919
matrix:
2020
os: [ ubuntu-latest, windows-latest ]
21-
php: [ 8.1, 8.2, 8.3, 8.4 ]
21+
php: [ 8.2, 8.3, 8.4, 8.5 ]
2222
stability: [ prefer-lowest, prefer-stable ]
2323

2424
name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}
2525

2626
steps:
2727
- name: Checkout code
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929

3030
- name: Setup PHP
3131
uses: shivammathur/setup-php@v2

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
],
1313
"homepage": "https://github.com/saloonphp/xml-wrangler",
1414
"require": {
15-
"php": "^8.1",
15+
"php": "^8.2",
1616
"veewee/xml": "^3.1.0",
1717
"spatie/array-to-xml": "^3.2",
1818
"ext-dom": "*"
1919
},
2020
"require-dev": {
2121
"friendsofphp/php-cs-fixer": "^3.5",
22-
"pestphp/pest": "^2.24",
22+
"pestphp/pest": "^v3.8.4 || v4.1.4",
2323
"phpstan/phpstan": "^1.9",
24-
"spatie/ray": "^1.33",
2524
"psr/http-message": "^2.0",
2625
"guzzlehttp/guzzle": "^7.8",
2726
"saloonphp/saloon": "^3.0",
28-
"illuminate/collections": "^10.30"
27+
"illuminate/collections": "^10.30",
28+
"symfony/var-dumper": "^7.3"
2929
},
3030
"minimum-stability": "stable",
3131
"autoload": {

0 commit comments

Comments
 (0)