Issue #3625843 - Fix phpcs warnings

Viktor Holovachekrequested to merge
issue/term_merge-3625843:3625843-fix-phpcs-warnings into 2.0.x

Closes #3625843

Merge request reports