Resolve #3471496 "Fix phpcs issues"

John Franklinrequested to merge
issue/legal-3471496:3471496-fix-phpcs-issues into 3.0.x

Closes #3471496

Cleans up all the issues that phpcs finds. A lot of change for no actual change.

Merge request reports