Coding standard issues

Fixed some small coding standard issues and added fabpot/php-cs-fixer to the dev requirements.