Issue #3359957: Fix the issues reported by phpcs

Closes #3359957

Merge request reports

Loading