SyntaxError::getNormalizedMessage(): bug fix - "in file on line" doesn't always get stripped

In certain cases, PHP puts the full file name in the error message. In those cases the "in filename.php on line .." trailing part of the error message did not get stripped off.

Also, in some cases, when Windows slashes are used in the file path, the "in filename.php on line .." trailing part of the error message may not get stripped off.
This last case will be exceedingly rare as on Windows, those file paths are handled correctly and the chances of a non-Windows user passing a path using Windows slashes will be minuscule.

Even so, I've fixed both cases by making the path handling in the function more robust.
* When the initial stripping of the trailing part of the error message fails, it will be retried up to two times.
* The first time, if Windows slashes would be found in the file path _after_ the `basename()` function has been applied, a "manual" basename extraction is done and the stripping of the trailing part is retried.
* The second time, the full file path is used in a last attempt to strip the trailing part of the error message.

Includes unit tests.

Fixes 94

Author: jrfnl

src/Errors/SyntaxError.php

@@ -6,6 +6,8 @@
 
 class SyntaxError extends ParallelLintError
 {
+    const IN_ON_REGEX = '~ in %s on line [0-9]+$~';
+
     /** @var Blame */
     private $blame;
 
@@ -29,8 +31,22 @@ public function getLine()
      */
     public function getNormalizedMessage($translateTokens = false)
     {
-        $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  = preg_replace('~^(Parse|Fatal) error: (syntax error, )?~', '', $this->message);
+        $baseName = basename($this->filePath);
+        $regex    = sprintf(self::IN_ON_REGEX, preg_quote($baseName, '~'));
+        $message  = preg_replace($regex, '', $message, -1, $count);
+
+        if ($count === 0 && strpos($baseName, '\\') !== false) {
+            $baseName = ltrim(strrchr($this->filePath, '\\'), '\\');
+            $regex    = sprintf(self::IN_ON_REGEX, preg_quote($baseName, '~'));
+            $message  = preg_replace($regex, '', $message, -1, $count);
+        }
+
+        if ($count === 0) {
+            $regex   = sprintf(self::IN_ON_REGEX, preg_quote($this->filePath, '~'));
+            $message = preg_replace($regex, '', $message);
+        }
+
         $message = ucfirst($message);
 
         if ($translateTokens) {

tests/Unit/Errors/SyntaxErrorGetNormalizeMessageTest.php

@@ -78,6 +78,26 @@ public function dataFilePathHandling()
                 'filePath' => 'test~file.php',
                 'fileName' => 'test~file.php',
             ),
+            'Full file path, linux slashes' => array(
+                'filePath' => 'path/to/subdir/file.php',
+                'fileName' => 'file.php',
+            ),
+            'File path, windows slashes' => array(
+                'filePath' => 'path\to\subdir\file.php',
+                'fileName' => 'file.php',
+            ),
+            'Absolute file path, windows slashes' => array(
+                'filePath' => 'C:\path\to\subdir\file.php',
+                'fileName' => 'C:\path\to\subdir\file.php',
+            ),
+            'Relative file path, windows slashes' => array(
+                'filePath' => '.\subdir\file.php',
+                'fileName' => '.\subdir\file.php',
+            ),
+            'Phar file name' => array(
+                'filePath' => 'phar://031.phar.php/a.php',
+                'fileName' => 'phar://031.phar.php/a.php',
+            ),
         );
     }
 }