Fixed Issues reorted by phpcs

Closes #3362860

Merge request reports