Merge pull request #20517 from seamuslee001/php8_more_template_test_fixes
authorEileen McNaughton <emcnaughton@wikimedia.org>
Sun, 6 Jun 2021 05:57:34 +0000 (17:57 +1200)
committerGitHub <noreply@github.com>
Sun, 6 Jun 2021 05:57:34 +0000 (17:57 +1200)
[php8-compat][REF] Fix more php8 test failures caused by template issues


Trivial merge