From 05cdae6d1a4602e6f6d6f025b93949412c38c29c Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Sat, 31 Mar 2012 20:10:38 -0400 Subject: [PATCH] Renamed fatal error handler configuration for follow the same logic of consoleHandler name. --- app/Config/core.php | 6 +++--- lib/Cake/Console/Templates/skel/Config/core.php | 6 +++--- lib/Cake/Core/App.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Config/core.php b/app/Config/core.php index a36970f16..91a444457 100644 --- a/app/Config/core.php +++ b/app/Config/core.php @@ -41,8 +41,8 @@ * * Options: * - * - `handleFatalError` - callback - The callback to handle fatal errors. You can set this to any - * callback type, including anonymous functions. + * - `fatalErrorHandler` - callback - The callback to handle fatal errors. You can set this to any + * callback type, including anonymous functions. Setting it to false will disable the feature. * - `handler` - callback - The callback to handle errors. You can set this to any callback type, * including anonymous functions. * - `level` - int - The level of errors you are interested in capturing. @@ -51,7 +51,7 @@ * @see ErrorHandler for more information on error handling and configuration. */ Configure::write('Error', array( - 'handleFatalError' => 'ErrorHandler::handleFatalError', + 'fatalErrorHandler' => 'ErrorHandler::handleFatalError', 'handler' => 'ErrorHandler::handleError', 'level' => E_ALL & ~E_DEPRECATED, 'trace' => true diff --git a/lib/Cake/Console/Templates/skel/Config/core.php b/lib/Cake/Console/Templates/skel/Config/core.php index cf22ed415..63fdfae92 100644 --- a/lib/Cake/Console/Templates/skel/Config/core.php +++ b/lib/Cake/Console/Templates/skel/Config/core.php @@ -41,8 +41,8 @@ * * Options: * - * - `handleFatalError` - callback - The callback to handle fatal errors. You can set this to any - * callback type, including anonymous functions. + * - `fatalErrorHandler` - callback - The callback to handle fatal errors. You can set this to any + * callback type, including anonymous functions. Setting it to false will disable the feature. * - `handler` - callback - The callback to handle errors. You can set this to any callback type, * including anonymous functions. * - `level` - int - The level of errors you are interested in capturing. @@ -51,7 +51,7 @@ * @see ErrorHandler for more information on error handling and configuration. */ Configure::write('Error', array( - 'handleFatalError' => 'ErrorHandler::handleFatalError', + 'fatalErrorHandler' => 'ErrorHandler::handleFatalError', 'handler' => 'ErrorHandler::handleError', 'level' => E_ALL & ~E_DEPRECATED, 'trace' => true diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php index fcc495b18..b62e66010 100644 --- a/lib/Cake/Core/App.php +++ b/lib/Cake/Core/App.php @@ -913,7 +913,7 @@ class App { return; } - $fatalErrorHandler = Configure::read('Error.handleFatalError'); + $fatalErrorHandler = Configure::read('Error.fatalErrorHandler'); if (!is_callable($fatalErrorHandler)) { return; }