CS fixes

- per php-cs-fixer (trailing whitespace)
Merge branch 'hotfix/cs'