Merge pull request #23955 from mhei/php8-update-to-8.3.6