resolve phpcs recommendations

Closes #3532418

Merge request reports

Loading