Re-add phploc and lint