CS fixes

- trailing whitespace
Better detection of PHP version

- Ensure JsonSerializable items are only tested against with 5.4.0 and up