Issue #3317152: PHP8.0 compatibility

Gareth Alexander requested to merge issue/hacked-3317152:3317152-php8.0-compatibility into 7.x-2.x Oct 24, 2022