Issue #3355258 by vimal_nadar, chaitanyadessai, apaderno, lesleyfernandes, zkhan.aamir: Fix the issues reported by phpcs
Closes #3355258