Merge pull request #16957 from mhei/php8-update