Merge pull request #17404 from mhei/php8-update