Fix PHPCS, overriding unnecessary changes from WPCS 2.2.0

Merged Erick Hitter requested to merge fix/phpcs into master

Merge request reports