Fix PHPCS errors
Merge pull request #4855 from ceeram/2.6-phpcs

Fix PHPCS errors