Fix PHPCS issues and improve code quality

Closes #3573065

Fixed phpcs errors

Merge request reports

Loading