Decouple ErrorHandler from ErrorRenderer component

yceruto · yceruto · commit 764c38a0e2a7 · 2019-07-20T10:35:37.000-04:00
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -21,7 +21,6 @@
 use Symfony\Component\ErrorHandler\FatalErrorHandler\FatalErrorHandlerInterface;
 use Symfony\Component\ErrorHandler\FatalErrorHandler\UndefinedFunctionFatalErrorHandler;
 use Symfony\Component\ErrorHandler\FatalErrorHandler\UndefinedMethodFatalErrorHandler;
-use Symfony\Component\ErrorRenderer\Exception\FlattenException;
 
 /**
  * A generic ErrorHandler for the PHP engine.
@@ -414,7 +413,7 @@ public function handleError($type, $message, $file, $line)
         }
 
         if (false !== strpos($message, "class@anonymous\0")) {
-            $logMessage = $this->levels[$type].': '.(new FlattenException())->setMessage($message)->getMessage();
+            $logMessage = $this->parseAnonymousClass($message);
         } else {
             $logMessage = $this->levels[$type].': '.$message;
         }
@@ -539,7 +538,7 @@ public function handleException($exception, array $error = null)
 
         if (($this->loggedErrors & $type) || $exception instanceof FatalThrowableError) {
             if (false !== strpos($message = $exception->getMessage(), "class@anonymous\0")) {
-                $message = (new FlattenException())->setMessage($message)->getMessage();
+                $message = $this->parseAnonymousClass($message);
             }
             if ($exception instanceof FatalErrorException) {
                 if ($exception instanceof FatalThrowableError) {
@@ -712,4 +711,15 @@ private function cleanTrace($backtrace, $type, $file, $line, $throw)
 
         return $lightTrace;
     }
+
+    /**
+     * Parse the error message by removing the anonymous class notation
+     * and using the parent class instead if possible.
+     */
+    private function parseAnonymousClass(string $message): string
+    {
+        return preg_replace_callback('/class@anonymous\x00.*?\.php0x?[0-9a-fA-F]++/', static function ($m) {
+            return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];
+        }, $message);
+    }
 }
diff --git a/src/Symfony/Component/ErrorHandler/composer.json b/src/Symfony/Component/ErrorHandler/composer.json
@@ -17,8 +17,7 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "psr/log": "~1.0",
-        "symfony/error-renderer": "^4.4|^5.0"
+        "psr/log": "~1.0"
     },
     "conflict": {
         "symfony/http-kernel": "<3.4"
