Merge "Pass phpcs-strict on tests/phpunit/GlobalFunctions/"