Issue #3356835 by shalini_jha, akshaydalvi212, mrinalini9, Rohit Rana: Fix the issues reported by phpcs