Update formatting

Fixes for issues CodeSniffer complained about at
https://integration.wikimedia.org/ci/job/mediawiki-core-phpcs-HEAD/9920/console
for 4f98011fdd98328028d152baf27627fea0c28d3e.

Change-Id: I2cc0cee6ff8260e74ad8b1721614ae16a360e68d
Merge "Update formatting"