Fix CS
Bump requirement to php5.4
Make use of 5.4 $this support