CS fixes using phpcs-fixer auto-correction.
Merge pull request #2126 from dereuromark/master-cs

cs fixes using phpcs-fixer auto-correction.