We are using PSR-2 now for new code (plus some other rules coming from object calisthenics)