Issue #3318185: Fix phpcs coding standards

Urvashi Vorarequested to merge
issue/weight-3318185:3318185-fix-phpcs-coding into 8.x-3.x

Closes #3318185

Merge request reports