KRF-298 #fix Fixed Ghost Error being thrown on each failure introduced in KRF-234

Author: khelle

Error/UndefinedError.php

@@ -51,7 +51,6 @@ abstract class ErrorHandler
      * @throws FatalError
      * @throws NoticeError
      * @throws WarningError
-     * @throws UndefinedError
      */
     public static function handleError($code, $message, $file, $line)
     {
@@ -66,7 +65,7 @@ public static function handleError($code, $message, $file, $line)
             case static::E_NOTICE:  throw new NoticeError($message);
             case static::E_WARNING: throw new WarningError($message);
             case static::E_ERROR:   throw new FatalError($message);
-            default:                throw new UndefinedError($message);
+            default:                return;
         }
     }
 

ErrorHandler.php

@@ -12,7 +12,22 @@ abstract class Throwable
      */
     public static function parseThrowableMessage($ex)
     {
-        return '[' . static::getBasename($ex['class']) . '] ' . '"' . trim($ex['message'], '"') . '"';
+        $message = $ex['message'];
+
+        if ($ex['isError'] && strpos($message, ' in ') !== false)
+        {
+            $message = preg_replace('#([a-zA-Z0-9-_]+?)/#siU', '', $message);
+            $message = preg_replace('#/#si', '', $message, 1);
+        }
+        else
+        {
+            $message = trim($message, '"');
+            $file = str_replace('.php', '', basename($ex['file']));
+            $line = $ex['line'];
+            $message = '"' . $message . '" in ' . $file . ':' . $line;
+        }
+
+        return '[' . static::getBasename($ex['class']) . '] ' . $message;
     }
 
     /**
@@ -51,6 +66,7 @@ public static function getThrowableData($ex, $offset = 0)
             'line'      => $ex->getLine(),
             'code'      => $ex->getCode(),
             'trace'     => static::getTraceElements($ex, $offset),
+            'isError'   => $ex instanceof \Error,
             'prev'      => null
         ];
     }