Merge pull request #20443 from seamuslee001/fix_error_php8