Fixed many small phpcs issues

This pr fixes many small phpcs issues
Yes, but we explicitly want to break compatibility with PSR-2 here, that's what I meant.

I am aware that it is not a superset.