Skip to content

Commit c983ac1

Browse files
authored
Merge pull request #22 from phpro/php-85-upgrade
Php 85 upgrade
2 parents ab4306a + ea53f59 commit c983ac1

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

.github/workflows/grumphp.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
operating-system: [ubuntu-latest]
10-
php-versions: ['8.1', '8.2', '8.3', '8.4']
10+
php-versions: ['8.3', '8.4', '8.5']
1111
composer-options: ['', '--prefer-lowest']
1212
fail-fast: false
1313
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} with ${{ matrix.composer-options }}
@@ -21,7 +21,7 @@ jobs:
2121
tools: 'composer:v2'
2222
extensions: pcov, mbstring, posix
2323
- name: Set env vars for latest PHP version
24-
if: matrix.php-versions == '8.4'
24+
if: matrix.php-versions == '8.5'
2525
run: |
2626
export COMPOSER_IGNORE_PLATFORM_REQ=php+
2727
export BOX_REQUIREMENT_CHECKER=0
@@ -34,7 +34,7 @@ jobs:
3434
id: composercache
3535
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
3636
- name: Cache dependencies
37-
uses: actions/cache@v2
37+
uses: actions/cache@v4
3838
with:
3939
path: ${{ steps.composercache.outputs.dir }}
4040
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -47,6 +47,5 @@ jobs:
4747
git config --global user.name "Your Name"
4848
- name: Run the tests
4949
run: php vendor/bin/grumphp run --no-interaction
50-
continue-on-error: ${{ matrix.php-versions == '8.1' && matrix.composer-options == '--prefer-lowest' }}
5150
env:
5251
PHP_CS_FIXER_IGNORE_ENV: 1

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "RFC7807 Problem details implementation",
44
"type": "library",
55
"require-dev": {
6-
"friendsofphp/php-cs-fixer": "^3.13",
7-
"phpro/grumphp-shim": "^2.10",
6+
"php-cs-fixer/shim": "^3.88",
7+
"phpro/grumphp-shim": "^2.17",
88
"phpspec/phpspec": "^7.2",
99
"symfony/validator": "^5.4 || ^6.0 || ^7.0",
1010
"sebastian/comparator": "^4.0"
@@ -17,7 +17,7 @@
1717
}
1818
],
1919
"require": {
20-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
20+
"php": "~8.3.0 || ~8.4.0 || ~8.5.0"
2121
},
2222
"config": {
2323
"sort-packages": true,

0 commit comments

Comments
 (0)