Doctrine 2 - ORM

[GH-370] Some PHP-CS fixes