Issue #3346900 by kkalashnikov, arunkumark, apaderno, Adil_Siddiqui, themodularlab: Fix the issues reported by phpcs