Issue #3367188 by arpitk, arti_parmar, clarkssquared, Ahmad Alyasaki: fix the issues reported by phpcs
Closes #3541169