Skip to content

Commit 1572c07

Browse files
committed
Use local phpcs, bump minimum PHP-version and start testing on PHP 8.5
1 parent 6c9b58d commit 1572c07

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/php.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
php-version: ['8.1', '8.2', '8.3', '8.4']
22+
php-version: ['8.2', '8.3', '8.4', '8.5']
2323

24-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.9.2
24+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.10.3
2525
with:
2626
php-version: ${{ matrix.php-version }}
2727

@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232

33-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.9.2
33+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.10.3
3434
with:
3535
enable_eslinter: false
3636
enable_jsonlinter: true
@@ -45,7 +45,7 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
operating-system: [ubuntu-latest]
48-
php-versions: ['8.1', '8.2', '8.3', '8.4']
48+
php-versions: ['8.2', '8.3', '8.4', '8.5']
4949

5050
steps:
5151
- name: Setup PHP, with composer and extensions
@@ -85,15 +85,15 @@ jobs:
8585
run: composer install --no-progress --prefer-dist --optimize-autoloader
8686

8787
- name: Run unit tests with coverage
88-
if: ${{ matrix.php-versions == '8.4' }}
88+
if: ${{ matrix.php-versions == '8.5' }}
8989
run: vendor/bin/phpunit
9090

9191
- name: Run unit tests (no coverage)
92-
if: ${{ matrix.php-versions != '8.4' }}
92+
if: ${{ matrix.php-versions != '8.5' }}
9393
run: vendor/bin/phpunit --no-coverage
9494

9595
- name: Save coverage data
96-
if: ${{ matrix.php-versions == '8.4' }}
96+
if: ${{ matrix.php-versions == '8.5' }}
9797
uses: actions/upload-artifact@v4
9898
with:
9999
name: coverage-data
@@ -107,7 +107,7 @@ jobs:
107107
fail-fast: true
108108
matrix:
109109
operating-system: [windows-latest]
110-
php-versions: ['8.1', '8.2', '8.3', '8.4']
110+
php-versions: ['8.2', '8.3', '8.4', '8.5']
111111

112112
steps:
113113
- name: Setup PHP, with composer and extensions
@@ -161,7 +161,7 @@ jobs:
161161
uses: shivammathur/setup-php@v2
162162
with:
163163
# Should be the higest supported version, so we can use the newest tools
164-
php-version: '8.4'
164+
php-version: '8.5'
165165
tools: composer, composer-require-checker, composer-unused, phpcs
166166
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, spl, xml
167167

@@ -193,7 +193,7 @@ jobs:
193193
run: composer-unused
194194

195195
- name: PHP Code Sniffer
196-
run: phpcs
196+
run: vendor/bin/phpcs
197197

198198
- name: PHPStan
199199
run: |
@@ -214,7 +214,7 @@ jobs:
214214
uses: shivammathur/setup-php@v2
215215
with:
216216
# Should be the lowest supported version
217-
php-version: '8.1'
217+
php-version: '8.2'
218218
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, spl, xml
219219
tools: composer
220220
coverage: none

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
}
3535
},
3636
"require": {
37-
"php": "^8.1",
37+
"php": "^8.2",
3838
"ext-pcre": "*",
3939

4040
"simplesamlphp/assert": "^1.1",

0 commit comments

Comments
 (0)