Issue #3339824 by andileco, lucienchalom, elber, sahil.goyal, nayana_mvr, apaderno, nikathone, Rashmisoni: Fix the issues reported by phpcs