Skip to content

Commit 4f42d8b

Browse files
committed
Merge remote-tracking branch 'origin/master' into next
2 parents 27aa4b8 + b6bc9e4 commit 4f42d8b

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ on:
77

88
jobs:
99
testsuite:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
php-version: ['7.3', '8.0', '8.1']
14+
php-version: ['7.3', '8.2']
1515
prefer-lowest: ['']
1616
include:
1717
- php-version: '7.3'
1818
prefer-lowest: 'prefer-lowest'
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2222

2323
- name: Setup PHP
2424
uses: shivammathur/setup-php@v2
@@ -32,7 +32,7 @@ jobs:
3232
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
3333

3434
- name: Cache dependencies
35-
uses: actions/cache@v2
35+
uses: actions/cache@v3
3636
with:
3737
path: ${{ steps.composercache.outputs.dir }}
3838
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -55,10 +55,10 @@ jobs:
5555

5656
validation:
5757
name: Coding Standard & Static Analysis
58-
runs-on: ubuntu-20.04
58+
runs-on: ubuntu-22.04
5959

6060
steps:
61-
- uses: actions/checkout@v2
61+
- uses: actions/checkout@v3
6262

6363
- name: Setup PHP
6464
uses: shivammathur/setup-php@v2
@@ -72,7 +72,7 @@ jobs:
7272
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
7373

7474
- name: Cache dependencies
75-
uses: actions/cache@v2
75+
uses: actions/cache@v3
7676
with:
7777
path: ${{ steps.composercache.outputs.dir }}
7878
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
For details on PSR-2-R see [fig-rectified-standards](https://github.com/php-fig-rectified/fig-rectified-standards).
1010

11+
For PHP version compatibility see [version map](https://github.com/php-fig-rectified/psr2r-sniffer/wiki).
12+
1113
Documentation @ [/docs/](docs).
1214

1315
This branch is for use with **PHP 8.1+** repos.

0 commit comments

Comments
 (0)