Merge pull request #15594 from ZhouyihaiDing/flaky

PHP: fix flaky tests