Issue #3351447: Fix the issues reported by PHPCS

Urvashi Vorarequested to merge
issue/smart_trim-3351447:3351447-fix-the-issues into 2.0.x

Closes #3351447

Merge request reports