fix: match result cleaning

marcocesarato · Jan 6, 2021 · 6f3d115 · 6f3d115
1 parent f7a57ff
commit 6f3d115
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Match.php b/src/Match.php
@@ -66,13 +66,14 @@ public static function getLineNumber($lastMatch, $contentRaw)
     public static function getText($type, $name, $description, $match, $line = null)
     {
         $maxLengthMatch = 500;
-        $prefix = ucfirst($type) . ' `' . $name . '`';
+        $prefix = ucfirst($type) . ' (' . $name . ')';
         if (!empty($line)) {
             $prefix .= ' [line ' . $line . ']';
         }
         $shortMatch = trim($match);
         $shortMatch = str_replace(PHP_EOL, ' ', $shortMatch);
         $shortMatch = strlen($shortMatch) > $maxLengthMatch ? substr($shortMatch, 0, $maxLengthMatch) . '...' : $match;
+        $shortMatch = preg_replace('/[\s]+/', ' ', $shortMatch);
 
         return $matchDescription = '[!] ' . trim($prefix) . "\n    - " . $description . "\n      => " . $shortMatch;
     }
@@ -98,6 +99,6 @@ public static function patternFunction($func)
      */
     public static function cleanFunctionResult($match)
     {
-        return preg_replace("/(?:.*?)(\S+[\s\r\n]*\((?<=\().*?(?=\))\))(?:.*)/si", '$1', $match);
+        return preg_replace("/(?:.*?)([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*[\s\r\n]*\((?<=\().*?(?=\))\))(?:.*)/si", '$1', $match);
     }
 }