Issue #3471496 - Fix phpcs issues in the new 4.0.x branch.

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

Fix the phpcs issues in the 4.0.x branch.

Closes #3471496

Merge request reports