Fix random CS rules, fix some broken phpdocs
Fix broken spec, add new for CoreBundle state machine callbacks
Some additional CS fixes
Merge pull request #1512 from stloyd/bugfix/cs

Fix random CS rules, fix some broken phpdocs, fix broken specs