From dad7963ea43b1d474903c83ada79620bc81fd2e4 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 14 Nov 2010 00:00:23 -0500
Subject: [PATCH] Moving Dispatcher inside libs directory, as it is part of
 CakePHP's libs.

---
 cake/{ => libs}/dispatcher.php                  |  0
 cake/tests/cases/libs/all_routing.test.php      | 14 ++++++++------
 cake/tests/cases/{ => libs}/dispatcher.test.php |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename cake/{ => libs}/dispatcher.php (100%)
 rename cake/tests/cases/{ => libs}/dispatcher.test.php (99%)

diff --git a/cake/dispatcher.php b/cake/libs/dispatcher.php
similarity index 100%
rename from cake/dispatcher.php
rename to cake/libs/dispatcher.php
diff --git a/cake/tests/cases/libs/all_routing.test.php b/cake/tests/cases/libs/all_routing.test.php
index 1f60002fc..6e32f472b 100644
--- a/cake/tests/cases/libs/all_routing.test.php
+++ b/cake/tests/cases/libs/all_routing.test.php
@@ -36,12 +36,14 @@ class AllRoutingTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new PHPUnit_Framework_TestSuite('All Router and Dispatcher class tests');
 
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'dispatcher.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'router.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'route' . DS . 'cake_route.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'route' . DS . 'plugin_short_route.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'cake_response.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'cake_request.test.php');
+		$libs = CORE_TEST_CASES . DS . 'libs' . DS;
+
+		$suite->addTestFile($libs . 'dispatcher.test.php');
+		$suite->addTestFile($libs . 'router.test.php');
+		$suite->addTestFile($libs . 'route' . DS . 'cake_route.test.php');
+		$suite->addTestFile($libs . 'route' . DS . 'plugin_short_route.test.php');
+		$suite->addTestFile($libs . 'cake_response.test.php');
+		$suite->addTestFile($libs . 'cake_request.test.php');
 		return $suite;
 	}
 }
diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/libs/dispatcher.test.php
similarity index 99%
rename from cake/tests/cases/dispatcher.test.php
rename to cake/tests/cases/libs/dispatcher.test.php
index c81639108..b16d4cd9b 100644
--- a/cake/tests/cases/dispatcher.test.php
+++ b/cake/tests/cases/libs/dispatcher.test.php
@@ -17,7 +17,7 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-require_once CAKE . 'dispatcher.php';
+App::import('Core', 'Dispatcher', false);
 App::import('Core', 'CakeResponse', false);
 
 if (!class_exists('AppController')) {