Issue #3376143 by aayushmankotia, Nitinkumar_7, roberttabigue, gnikolovski: Fix the issues reported by phpcs