Issue #3571496 PHP 8.5 issues resolved

Closes #3571496

Merge request reports

Loading