Fixed many small phpcs issues

This pr fixes many small phpcs issues
Always the same discussion ;) Maybe it's time to open an issue @ https://github.com/doctrine/coding-standard and have it be settled by the team once and for all.