Merge pull request #20597 from seamuslee001/php8_test_fixes