Issue #3565138: resolve phpcs errors which could not be fixed automatically

Closes #3565138

Merge request reports

Loading