Merge pull request #20516 from seamuslee001/php8_more_test_fixes
authorEileen McNaughton <emcnaughton@wikimedia.org>
Sun, 6 Jun 2021 21:58:39 +0000 (09:58 +1200)
committerGitHub <noreply@github.com>
Sun, 6 Jun 2021 21:58:39 +0000 (09:58 +1200)
[php8-compat][REF] Fix some more test failures in php8


Trivial merge