Skip to content

upgrade Engine block to php 8.5#1962

Merged
kayjoosten merged 4 commits intomainfrom
feature/issue-1847-upgrade-php8.5
Apr 7, 2026
Merged

upgrade Engine block to php 8.5#1962
kayjoosten merged 4 commits intomainfrom
feature/issue-1847-upgrade-php8.5

Conversation

@kayjoosten
Copy link
Copy Markdown
Contributor

No description provided.

- Rename Dockerfile-php82 → Dockerfile-php85, use php85-apache2-node24 base image
- Rename docker-compose-php82.yml → docker-compose-php85.yml
- Update Dockerfile.prod to php85-apache2
- Update docker-compose-tag-release.yml to php85-apache2-node24
- Bump composer.json PHP constraint to ^8.5, run composer update
- Run yarn upgrade for Node 24 compatibility
- Update GitHub Actions matrix and PROD_PHP to php85

Fixes #1847
Apply ExplicitNullableParamTypeRector across src/, library/ and tests/
to replace implicit nullable params (Foo $x = null) with explicit
nullable types (?Foo $x = null), fixing the PHP 8.5 deprecation that
was crashing the PHPUnit bootstrap.

794 PHPUnit tests passing on PHP 8.5 after this change.
- Bindings.php: replace null array key with empty string
- NameIdResolver.php: cast spId/idpId to string before session access
- XmlToArray.php: remove xml_parser_free() deprecated since PHP 8.5

All 277 Behat scenarios now pass.
@johanib
Copy link
Copy Markdown
Contributor

johanib commented Apr 7, 2026

The websocket lib was rewritten, but mink still uses the old version:
https://gitlab.com/behat-chrome/chrome-mink-driver/-/merge_requests/222/diffs#3957b91a0d8450cea0115cfd5af69eac90d75897

Maybe we can try to use that branch. Or maybe checkout https://github.com/robertfausk/mink-panther-driver instead of dmore.

Having said that, I'm ok with the patch. I would say: Just merge it with the patch, as time invested into other solutions will not make it better.

This PR is good to merge! Just one question remains: If we merge it, OpenConext/OpenConext-devconf#88 will also need to be merged.
This will mean the 'old' release branches will need a manual line in the .env to run the 7.0 / 7.1 releases in devconf.
Please announce the instructions on how to run those versions after merging.

@kayjoosten kayjoosten merged commit 1cdd470 into main Apr 7, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants