Issue #3514294: Fix issues reported by PHPCS

Girish Grequested to merge
issue/shortcode-3514294:3514294-fix-issues-reported into 2.0.x

Closes #3514294

Merge request reports