Fixed phpcs and code quality

Closes #3558972

Merge request reports

Loading