Add phpCodeSniffer to require-dev in composer.json
CS fixes in src
CS fixes in test
Merge pull request #964 from tommygnr/cs-fixes

CS fixes