Issue #3391633 by Liam Morland, Shreya_th, sidharth_soman, Tirupati_Singh, Yashaswi18, Grevil, Mohd Sahzad, Anybody: Fix phpcs issues