Issue #3328761: Fix the issues reported by phpcs

Alberto Padernorequested to merge
issue/extra_field-3328761:3328761-fix-phpcs-issues into 8.x-2.x

Closes #3328761

Merge request reports