Fix incremental parsing problem with non-terminal extras

Also add PHP grammar as a fixture to test against.

cli/src/tests/corpus_test.rs

@@ -22,6 +22,7 @@ const LANGUAGES: &'static [&'static str] = &[
     "html",
     "javascript",
     "json",
+    "php",
     "python",
 ];