And run the other stuff against Php5 and Php7 parsers. Also move canonicalize() from CodeTestAbstract into a free-standing function.