Issue #3337439 by jhedstrom, himanshu_jhaloya, sahil.goyal, Charchil Khandelwal, bharath-kondeti, paraderojether, apaderno: Fix the issues reported by phpcs
Closes #3388002