Issue #3355405 by nitin_lama, samit.310@gmail.com, oskar_calvo,...

oskar_calvorequested to merge
3355405-fix-the-issues into 1.0.x

Issue #3355405 by nitin_lama, samit.310@gmail.com, oskar_calvo, paraderojether, bindu r, avpaderno: Fix the issues reported by phpcs

Closes #3355405

Merge request reports