Catch lexer errors in throwOnError=0 mode

Author: nikic

lib/PhpParser/ParserAbstract.php

@@ -132,9 +132,21 @@ public function getErrors() {
      *                     unable to recover from an error).
      */
     public function parse($code) {
-        $this->lexer->startLexing($code);
         $this->errors = array();
 
+        // Initialize the lexer
+        try {
+            $this->lexer->startLexing($code);
+        } catch (Error $e) {
+            $this->errors[] = $e;
+            if ($this->throwOnError) {
+                throw $e;
+            } else {
+                // Currently can't recover from lexer errors
+                return null;
+            }
+        }
+
         // We start off with no lookahead-token
         $symbol = self::SYMBOL_NONE;
 

test/code/parser/errorHandling/lexerErrors.test

@@ -0,0 +1,25 @@
+Lexer errors
+-----
+<?php
+
+$a = 42;
+/*
+$b = 24;
+-----
+Unterminated comment on line 4
+-----
+<?php
+
+$a = 42;
+@@{ "\1" }@@
+$b = 24;
+-----
+Unexpected character "@@{ "\1" }@@" (ASCII 1) on unknown line
+-----
+<?php
+
+$a = 42;
+@@{ "\0" }@@
+$b = 24;
+-----
+Unexpected null byte on unknown line