PHP Code Sniffer (7) + Migrate Fixes