feat: #3372191 Fix the warnings/errors reported by PHPCS

Closes #3372191

Merge request reports

Loading