Issue #3396781 by bluegeek9: Fix issues reported by phpcs

Closes #3396781

Merge request reports

Loading