Require PHP54
PHPCS Fixes