Updated usage of PhpTokenizer according to vendor changes
Block level bug fix in FormatImportsCommand