diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php index a8421d63c37..6304b2f22e7 100644 --- a/lib/Cake/Console/ShellDispatcher.php +++ b/lib/Cake/Console/ShellDispatcher.php @@ -136,7 +136,7 @@ function __bootstrap() { include_once CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'templates' . DS . 'skel' . DS . 'Config' . DS . 'core.php'; App::build(); } - require_once CONSOLE_LIBS . 'ConsoleErrorHandler.php'; + require_once CAKE . 'Console' . DS . 'ConsoleErrorHandler.php'; set_exception_handler(array('ConsoleErrorHandler', 'handleException')); set_error_handler(array('ConsoleErrorHandler', 'handleError'), Configure::read('Error.level')); diff --git a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php index a19e9bf1293..7c1abbc00c4 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php @@ -42,7 +42,7 @@ public function setup() { $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); - $this->Task = $this->getMock('TemplateTask', + $this->Task = $this->getMock('TemplateTask', array('in', 'err', 'createFile', '_stop', 'clear'), array($out, $out, $in) ); @@ -73,7 +73,7 @@ public function testSet() { $this->assertEqual($this->Task->templateVars['one'], 'three'); $this->assertTrue(isset($this->Task->templateVars['four'])); $this->assertEqual($this->Task->templateVars['four'], 'five'); - + $this->Task->templateVars = array(); $this->Task->set(array(3 => 'three', 4 => 'four')); $this->Task->set(array(1 => 'one', 2 => 'two')); @@ -99,7 +99,7 @@ public function testFindingInstalledThemesForBake() { * @return void */ public function testGetThemePath() { - $defaultTheme = LIBS . dirname(CONSOLE_LIBS) . 'templates' . DS . 'default' .DS; + $defaultTheme = LIBS . 'Console' . DS . 'templates' . DS . 'default' .DS; $this->Task->templatePaths = array('default' => $defaultTheme); $this->Task->expects($this->exactly(1))->method('in')->will($this->returnValue('1')); diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php index 4a895e7201b..9b64e6e0c43 100644 --- a/lib/Cake/bootstrap.php +++ b/lib/Cake/bootstrap.php @@ -80,11 +80,6 @@ */ define('IMAGES', WWW_ROOT.'img'.DS); -/** - * Path to the console libs direcotry. - */ - define('CONSOLE_LIBS', CAKE . 'Console' . DS); - /** * Path to the tests directory. */