Make error handling use Configure again.

cakephp · Sep 18, 2012 · 5d2cef2 · 5d2cef2
1 parent dcae30a
commit 5d2cef2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/App/Config/error.php b/App/Config/error.php
@@ -32,12 +32,12 @@
  *
  * @see ErrorHandler for more information on error handling and configuration.
  */
-	$error = array(
+	Configure::write('Error', [
 		'handler' => 'Cake\Error\ErrorHandler::handleError',
 		'consoleHandler' => 'Cake\Console\ConsoleErrorHandler::handleError',
 		'level' => E_ALL & ~E_DEPRECATED,
 		'trace' => true
-	);
+	]);
 
 /**
  * Configure the Exception handler used for uncaught exceptions.  By default,
@@ -55,16 +55,14 @@
  *
  * @see ErrorHandler for more information on exception handling and configuration.
  */
-	$exception = array(
+	Configure::write('Exception', [
 		'handler' => 'Cake\Error\ErrorHandler::handleException',
 		'consoleHandler' => 'Cake\Console\ConsoleErrorHandler::handleException',
 		'renderer' => 'Cake\Error\ExceptionRenderer',
 		'log' => true
-	);
+	]);
 
-	Configure::setErrorHandlers(
-		$error,
-		$exception
-	);
-
-	unset($error, $exception);
+/**
+ * Once configured, set the error/exception handlers to PHP's default handlers.
+ */
+	Configure::setErrorHandlers();
diff --git a/App/Config/session.php b/App/Config/session.php
@@ -14,7 +14,7 @@
  */
 namespace App\Config;
 
-use Cake\Model\Datasource\Session;
+use Cake\Core\Configure;
 
 /**
  * Session configuration.
@@ -52,8 +52,7 @@
  *
  * To use database sessions, run the app/Config/Schema/sessions.php schema using
  * the cake shell command: cake schema create Sessions
- *
  */
-	Session::config(array(
+	Configure::write('Session', [
 		'defaults' => 'php'
-	));
+	]);
diff --git a/lib/Cake/Core/Configure.php b/lib/Cake/Core/Configure.php
@@ -348,24 +348,28 @@ public static function clear() {
 		static::$_values = array();
 		return true;
 	}
+
 /**
- * Set the error and exception handlers.
+ * Set the error and exception handlers using the native default handlers.
+ *
+ * Uses data already stored in Configure.
  *
- * @param array $error The Error handling configuration.
- * @param array $exception The exception handling configuration.
  * @return void
  */
-	public static function setErrorHandlers($error, $exception) {
+	public static function setErrorHandlers() {
 		$level = -1;
+		$error = static::read('Error');
 		if (isset($error['level'])) {
 			error_reporting($error['level']);
 			$level = $error['level'];
 		}
 		if (!empty($error['handler'])) {
 			set_error_handler($error['handler'], $level);
 		}
+		$exception = static::read('Exception');
 		if (!empty($exception['handler'])) {
 			set_exception_handler($exception['handler']);
 		}
 	}
+
 }