Merge pull request #24251 from mhei/php8-update-to-8.3.7