PHPCS cleanup

Should all errors except in the DI package