Fixing SessionComponent tests

cakephp · Jan 28, 2011 · 4a55ef4 · 4a55ef4
1 parent 024bff2
commit 4a55ef4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/Cake/Controller/AppController.php b/lib/Cake/Controller/AppController.php
@@ -20,6 +20,8 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('Controller', 'Controller');
+
 /**
  * This is a placeholder class.
  * Create the same file in app/app_controller.php

diff --git a/lib/Cake/Controller/Component/SessionComponent.php b/lib/Cake/Controller/Component/SessionComponent.php
@@ -17,6 +17,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('Component', 'Controller');
 App::uses('CakeSession', 'Model/Datasource');
 
 /**

diff --git a/lib/Cake/Core/Object.php b/lib/Cake/Core/Object.php
@@ -66,9 +66,7 @@ public function requestAction($url, $extra = array()) {
 		if (empty($url)) {
 			return false;
 		}
-		if (!class_exists('dispatcher')) {
-			require LIBS . 'dispatcher.php';
-		}
+		App::uses('Dispatcher', 'Routing');
 		if (in_array('return', $extra, true)) {
 			$extra = array_merge($extra, array('return' => 0, 'autoRender' => 1));
 		}