From a6702b70d4863f51388879099daa8746fae07b65 Mon Sep 17 00:00:00 2001
From: Gareth Ellis <garethellis@gmail.com>
Date: Wed, 23 Mar 2016 19:05:23 +0000
Subject: [PATCH] Extracts error trace in ErrorHandler to a helper function to
 allow customization

---
 lib/Cake/Error/ErrorHandler.php               | 46 ++++++++++++-------
 lib/Cake/Test/Case/Error/ErrorHandlerTest.php |  2 +-
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/lib/Cake/Error/ErrorHandler.php b/lib/Cake/Error/ErrorHandler.php
index 9da40a660..ee7490aea 100644
--- a/lib/Cake/Error/ErrorHandler.php
+++ b/lib/Cake/Error/ErrorHandler.php
@@ -207,7 +207,6 @@ class ErrorHandler {
 		if (error_reporting() === 0) {
 			return false;
 		}
-		$errorConfig = Configure::read('Error');
 		list($error, $log) = static::mapErrorCode($code);
 		if ($log === LOG_ERR) {
 			return static::handleFatalError($code, $description, $file, $line);
@@ -228,21 +227,7 @@ class ErrorHandler {
 			);
 			return Debugger::getInstance()->outputError($data);
 		}
-		$message = $error . ' (' . $code . '): ' . $description . ' in [' . $file . ', line ' . $line . ']';
-		if (!empty($errorConfig['trace'])) {
-			// https://bugs.php.net/bug.php?id=65322
-			if (version_compare(PHP_VERSION, '5.4.21', '<')) {
-				if (!class_exists('Debugger')) {
-					App::load('Debugger');
-				}
-				if (!class_exists('CakeText')) {
-					App::uses('CakeText', 'Utility');
-					App::load('CakeText');
-				}
-			}
-			$trace = Debugger::trace(array('start' => 1, 'format' => 'log'));
-			$message .= "\nTrace:\n" . $trace . "\n";
-		}
+		$message = static::_getErrorMessage($error, $code, $description, $file, $line);
 		return CakeLog::write($log, $message);
 	}
 
@@ -328,4 +313,33 @@ class ErrorHandler {
 		return array($error, $log);
 	}
 
+/**
+ * Generate the string to use to describe the error.
+ *
+ * @param string $error The error type (e.g. "Warning")
+ * @param int $code Code of error
+ * @param string $description Error description
+ * @param string $file File on which error occurred
+ * @param int $line Line that triggered the error
+ * @return string
+ */
+	protected static function _getErrorMessage($error, $code, $description, $file, $line) {
+		$errorConfig = Configure::read('Error');
+		$message = $error . ' (' . $code . '): ' . $description . ' in [' . $file . ', line ' . $line . ']';
+		if (!empty($errorConfig['trace'])) {
+			// https://bugs.php.net/bug.php?id=65322
+			if (version_compare(PHP_VERSION, '5.4.21', '<')) {
+				if (!class_exists('Debugger')) {
+					App::load('Debugger');
+				}
+				if (!class_exists('CakeText')) {
+					App::uses('CakeText', 'Utility');
+					App::load('CakeText');
+				}
+			}
+			$trace = Debugger::trace(array('start' => 1, 'format' => 'log'));
+			$message .= "\nTrace:\n" . $trace . "\n";
+		}
+		return $message;
+	}
 }
diff --git a/lib/Cake/Test/Case/Error/ErrorHandlerTest.php b/lib/Cake/Test/Case/Error/ErrorHandlerTest.php
index 18930737b..0cb9b25f7 100644
--- a/lib/Cake/Test/Case/Error/ErrorHandlerTest.php
+++ b/lib/Cake/Test/Case/Error/ErrorHandlerTest.php
@@ -203,7 +203,7 @@ class ErrorHandlerTest extends CakeTestCase {
 			$result[0]
 		);
 		$this->assertRegExp('/^Trace:/', $result[1]);
-		$this->assertRegExp('/^ErrorHandlerTest\:\:testHandleErrorLoggingTrace\(\)/', $result[2]);
+		$this->assertRegExp('/^ErrorHandlerTest\:\:testHandleErrorLoggingTrace\(\)/', $result[3]);
 		if (file_exists(LOGS . 'debug.log')) {
 			unlink(LOGS . 'debug.log');
 		}