Skip to content

Commit 6df5aa9

Browse files
authored
Merge pull request #96 from fschmtt/php82
Require php:^8.2
2 parents 0bde03a + 3be1bc5 commit 6df5aa9

File tree

8 files changed

+23
-10
lines changed

8 files changed

+23
-10
lines changed

.github/workflows/php-analysis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v2
1515

16+
- uses: shivammathur/setup-php@v2
17+
with:
18+
php-version: '8.2'
19+
1620
- name: Install dependencies
1721
run: composer install --prefer-dist --no-progress
1822

.github/workflows/php-integration-legacy.yml

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v2
3333

34+
- uses: shivammathur/setup-php@v2
35+
with:
36+
php-version: '8.2'
37+
3438
- name: Install dependencies
3539
run: composer install --prefer-dist --no-progress
3640

.github/workflows/php-integration.yml

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v2
2424

25+
- uses: shivammathur/setup-php@v2
26+
with:
27+
php-version: '8.2'
28+
2529
- name: Build Keycloak image
2630
run: >
2731
docker build

.github/workflows/php-unit.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,20 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v2
1717

18+
- uses: shivammathur/setup-php@v2
19+
with:
20+
php-version: '8.2'
21+
coverage: pcov
22+
1823
- name: Install dependencies
1924
run: composer install --prefer-dist --no-progress
2025

2126
- name: Run unit tests
2227
run: vendor/bin/phpunit --testsuite unit
2328

2429
- name: Upload coverage reports
25-
uses: codecov/codecov-action@v3
30+
uses: codecov/codecov-action@v4
2631
with:
32+
fail_ci_if_error: true
2733
files: phpunit.cobertura.xml
34+
token: ${{ secrets.CODECOV_TOKEN }}

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "PHP client to interact with Keycloak's Admin REST API.",
44
"type": "library",
55
"require": {
6-
"php": "^8.1",
6+
"php": "^8.2",
77
"ext-json": "*",
88
"guzzlehttp/guzzle": "^7.3",
99
"lcobucci/jwt": "^4.1 || ^5.2"

devenv.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{
44
languages.php.enable = lib.mkDefault true;
5-
languages.php.version = lib.mkDefault "8.1";
5+
languages.php.version = lib.mkDefault "8.2";
66
languages.php.extensions = ["pcov"];
77
languages.php.ini = ''
88
memory_limit = 2G

docker-compose.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ version: '3.7'
22

33
services:
44
php:
5-
build:
6-
context: .
7-
dockerfile: docker/php/Dockerfile
5+
image: php:8.2-cli
86
volumes:
97
- .:/app:rw
108
working_dir: /app

docker/php/Dockerfile

-4
This file was deleted.

0 commit comments

Comments
 (0)