Fix emulative lexer with default error handler

If no error handler is provided, explicitly create one, so we don't end up calling handleError() on null.
nikic · May 20, 2023 · fb2c3ac · fb2c3ac
1 parent c23976a
commit fb2c3ac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/lib/PhpParser/Lexer/Emulative.php b/lib/PhpParser/Lexer/Emulative.php
@@ -85,6 +85,10 @@ public function startLexing(string $code, ?ErrorHandler $errorHandler = null): v
             return;
         }
 
+        if ($errorHandler === null) {
+            $errorHandler = new ErrorHandler\Throwing();
+        }
+
         $this->patches = [];
         foreach ($emulators as $emulator) {
             $code = $emulator->preprocessCode($code, $this->patches);

diff --git a/test/PhpParser/LexerTest.php b/test/PhpParser/LexerTest.php
@@ -47,6 +47,14 @@ public function provideTestError() {
         ];
     }
 
+    public function testDefaultErrorHandler() {
+        $this->expectException(Error::class);
+        $this->expectExceptionMessage('Unterminated comment on line 1');
+        $lexer = $this->getLexer();
+        $lexer->startLexing("<?php readonly /*");
+        $lexer->getNextToken();
+    }
+
     /**
      * @dataProvider provideTestLex
      */