Issue #3514969: Fix newly reported phpcs errors

Closes #3514969

Merge request reports

Loading