Issue #3357579: Fix the issues reported by phpcs

Closes #3357579

Merge request reports

Loading