Fixed many small phpcs issues

This pr fixes many small phpcs issues
@Ocramius any reason why doctrine differs from the PSR-2? Of course if there is an other reason than personal taste ;)