Skip to content

Commit

Permalink
Moving error handling classes into a separate directory.
Browse files Browse the repository at this point in the history
Moving error handling test cases into a directory that matches the one in libs.
Updating imports.
  • Loading branch information
markstory committed Nov 28, 2010
1 parent e40ee25 commit 284a8db
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions cake/bootstrap.php
Expand Up @@ -26,14 +26,14 @@

require CORE_PATH . 'cake' . DS . 'basics.php';
require CORE_PATH . 'cake' . DS . 'config' . DS . 'paths.php';
require LIBS . 'exceptions.php';
require LIBS . 'error' . DS . 'exceptions.php';
require LIBS . 'object.php';
require LIBS . 'inflector.php';
require LIBS . 'app.php';
require LIBS . 'configure.php';
require LIBS . 'set.php';
require LIBS . 'cache.php';
require LIBS . 'error_handler.php';
require LIBS . 'error' . DS . 'error_handler.php';

Configure::bootstrap(isset($boot) ? $boot : true);

Expand Up @@ -104,7 +104,7 @@ class ErrorHandler {
* @see http://php.net/manual/en/function.set-exception-handler.php
*/
public static function handleException(Exception $exception) {
App::import('Core', 'ExceptionRenderer');
App::import('Core', 'error/ExceptionRenderer');
$config = Configure::read('Exception');
if (!empty($config['log'])) {
if (!class_exists('CakeLog')) {
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions cake/tests/cases/libs/all_error.test.php
Expand Up @@ -38,8 +38,8 @@ public static function suite() {

$libs = CORE_TEST_CASES . DS . 'libs' . DS;

$suite->addTestFile($libs . 'error_handler.test.php');
$suite->addTestFile($libs . 'exception_renderer.test.php');
$suite->addTestFile($libs . 'error' . DS . 'error_handler.test.php');
$suite->addTestFile($libs . 'error' . DS . 'exception_renderer.test.php');
return $suite;
}
}

0 comments on commit 284a8db

Please sign in to comment.