Issue #3337836 by Jay Jangid, Adil_Siddiqui, omkar_yewale, sidharth_soman, spriya2896, devkinetic, apaderno, rckstr_rohan: Fix the issues reported by phpcs