Do not trigger PHP 8.5 deprecations

Closes #3557346

Merge request reports

Loading