PHP 8.4/11.4 fixes

Lee Rowlandsrequested to merge
issue/tome-3607811:3607811-min-delta into 8.x-1.x

Closes #3607811

Merge request reports