[#3502922] fix: Fix issues reported by phpcs

Liam Morlandrequested to merge
issue/facets-3502922:3502922-phpcs into 3.0.x

Closes #3502922

Merge request reports