From a8d4015f47d31cff254bf6e9fce961cdd4c4598c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 30 Aug 2010 22:59:10 -0400
Subject: [PATCH] Updating bootstrap process in CLI to match the one in web.
 Updating all_libs to use new file. Updating error_handler test to run in cli.
 Updating Controller so it imports required classes.

---
 cake/console/cake.php                        | 1 +
 cake/libs/controller/controller.php          | 1 +
 cake/tests/cases/libs/all_libs.test.php      | 2 +-
 cake/tests/cases/libs/error_handler.test.php | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cake/console/cake.php b/cake/console/cake.php
index 4e4673cfc..0b94cb888 100644
--- a/cake/console/cake.php
+++ b/cake/console/cake.php
@@ -260,6 +260,7 @@ class ShellDispatcher {
 
 		$includes = array(
 			CORE_PATH . 'cake' . DS . 'config' . DS . 'paths.php',
+			CORE_PATH . 'cake' . DS . 'libs' . DS . 'exceptions.php',
 			CORE_PATH . 'cake' . DS . 'libs' . DS . 'object.php',
 			CORE_PATH . 'cake' . DS . 'libs' . DS . 'inflector.php',
 			CORE_PATH . 'cake' . DS . 'libs' . DS . 'configure.php',
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index db1636ec0..97cfa8a4d 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -22,6 +22,7 @@
  * Include files
  */
 App::import('Controller', 'Component', false);
+App::import('Core', 'CakeResponse', false);
 App::import('View', 'View', false);
 
 /**
diff --git a/cake/tests/cases/libs/all_libs.test.php b/cake/tests/cases/libs/all_libs.test.php
index 905c23c1e..32a196953 100644
--- a/cake/tests/cases/libs/all_libs.test.php
+++ b/cake/tests/cases/libs/all_libs.test.php
@@ -39,7 +39,7 @@ class AllLibsTest extends PHPUnit_Framework_TestSuite {
 		$suite->addTestFile(CORE_TEST_CASES . DS . 'basics.test.php');
 		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'cake_session.test.php');
 		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'debugger.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'error.test.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'error_handler.test.php');
 		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'file.test.php');
 		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'folder.test.php');
 		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'log' . DS . 'file_log.test.php');
diff --git a/cake/tests/cases/libs/error_handler.test.php b/cake/tests/cases/libs/error_handler.test.php
index c38795999..de2d82662 100644
--- a/cake/tests/cases/libs/error_handler.test.php
+++ b/cake/tests/cases/libs/error_handler.test.php
@@ -18,6 +18,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 
+App::import('Core', array('ErrorHandler', 'Controller', 'Component'));
 
 /**
  * Short description for class.
@@ -89,7 +90,6 @@ if (!class_exists('AppController')) {
 } elseif (!defined('APP_CONTROLLER_EXISTS')){
 	define('APP_CONTROLLER_EXISTS', true);
 }
-App::import('Core', array('ErrorHandler', 'Controller', 'Component'));
 
 /**
  * BlueberryComponent class