Issue #3363461 by mrinalini9, urvashi_vora, kenyoOwen, Ashutosh Ahirwal: Fix the issues reported by phpcs
Closes #3363461