Issue #3350621 by Binoli Lalani, davps, apaderno, pray_12, Shruu_rao: Fix the issues reported by phpcs