Fixed the issues reported by phpcs

Please review and merge if looks good.

Merge request reports

Loading