Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/run-cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
php: [ php82 ]
php: [ php85 ]
env:
PROD_PHP: php82
PROD_PHP: php85
DOCKER_COMPOSE: docker compose -f docker-compose.yml -f docker-compose-${{matrix.php}}.yml
steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
php: [ php82 ]
php: [ php85 ]
env:
PROD_PHP: php82
PROD_PHP: php85
DOCKER_COMPOSE: docker compose -f docker-compose.yml -f docker-compose-${{matrix.php}}.yml
steps:
- name: Checkout
Expand Down
12 changes: 10 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"source": "https://github.com/OpenConext/OpenConext-engineblock"
},
"require": {
"php": "^8.2",
"php": "^8.5",
"ext-dom": "*",
"ext-json": "*",
"ext-mbstring": "*",
Expand Down Expand Up @@ -58,6 +58,7 @@
"behat/behat": "^3.26",
"behat/mink": "^1.12",
"behat/mink-browserkit-driver": "^2.2",
"cweagans/composer-patches": "^1.7",
"dmore/behat-chrome-extension": "^1.4",
"dmore/chrome-mink-driver": "2.9.3",
"friends-of-behat/mink-extension": "^2.7.5",
Expand Down Expand Up @@ -129,16 +130,23 @@
"config": {
"optimize-autoloader": true,
"platform": {
"php": "8.2"
"php": "8.5"
},
"sort-packages": true,
"allow-plugins": {
"cweagans/composer-patches": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"endroid/installer": false,
"symfony/flex": true
}
},
"extra": {
"composer-exit-on-patch-failure": true,
"patches": {
"phrity/websocket": {
"PHP 8.5: fix implicit nullable param in ConnectionException": "patches/phrity-websocket-php85-nullable.patch"
}
},
"symfony": {
"allow-contrib": false,
"require": "7.4.*"
Expand Down
Loading