Just a note - I'm going to try using https://github.com/doctrine/coding-standard from now on