Issue #3345418 by annmarysruthy, imustakim, lamp5, Krzysztof Domański: Fix the issues reported by phpcs