Fix CodeSniffer errors and warnings

For the files touched in I06ee0f01d8 as logged at
https://integration.wikimedia.org/ci/job/mediawiki-core-phpcs-strict-HEAD/7798/console

Change-Id: I811884f7a5ada4d0551552d0a2c2775d6b17b59f
Merge "Fix CodeSniffer errors and warnings"