Better parsing error message in PHP 7, fixes #69

Author: JakubOnderka

Diff for: src/Error.php

@@ -133,7 +133,7 @@ class SyntaxError extends Error
      */
     public function getLine()
     {
-        preg_match('~on line ([0-9]*)~', $this->message, $matches);
+        preg_match('~on line ([0-9]+)$~', $this->message, $matches);
 
         if ($matches && isset($matches[1])) {
             $onLine = (int) $matches[1];
@@ -149,9 +149,9 @@ public function getLine()
      */
     public function getNormalizedMessage($translateTokens = false)
     {
-        $message = preg_replace('~(Parse|Fatal) error: syntax error, ~', '', $this->message);
+        $message = preg_replace('~^(Parse|Fatal) error: (syntax error, )?~', '', $this->message);
+        $message = preg_replace('~ in ' . preg_quote(basename($this->filePath)) . ' on line [0-9]+$~', '', $message);
         $message = ucfirst($message);
-        $message = preg_replace('~ in (.*) on line [0-9]*~', '', $message);
 
         if ($translateTokens) {
             $message = $this->translateTokens($message);

Diff for: tests/SyntaxError.normalizeMessage.phpt

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @testCase
+ */
+
+require __DIR__ . '/../vendor/autoload.php';
+
+use JakubOnderka\PhpParallelLint\SyntaxError;
+use Tester\Assert;
+
+class SyntaxErrorNormalizeMessageTest extends Tester\TestCase
+{
+    public function testInWordInErrorMessage()
+    {
+        $message = 'Fatal error: \'break\' not in the \'loop\' or \'switch\' context in test.php on line 2';
+        $error = new SyntaxError('test.php', $message);
+        Assert::equal('\'break\' not in the \'loop\' or \'switch\' context', $error->getNormalizedMessage());
+    }
+
+    public function testInWordInErrorMessageAndInFileName()
+    {
+        $message = 'Fatal error: \'break\' not in the \'loop\' or \'switch\' context in test in file.php on line 2';
+        $error = new SyntaxError('test in file.php', $message);
+        Assert::equal('\'break\' not in the \'loop\' or \'switch\' context', $error->getNormalizedMessage());
+    }
+}
+
+$testCase = new SyntaxErrorNormalizeMessageTest;
+$testCase->run();