Issue #3322809: Fix the issues reported by phpcs

Alberto Padernorequested to merge
issue/field_permissions-3322809:3322809-8.x-1.x into 8.x-1.x

Closes #3322809

Merge request reports