Merge pull request #16037 from mhei/php8-update