Fixed phpcs issues.

Sidharth Somanrequested to merge
issue/config_distro-3359842:3359842-fix-the-issues into 2.0.x

Closes #3359842

Merge request reports