Merge branch 'dispatcher-request' into 2.0

Conflicts: cake/libs/configure.php cake/tests/cases/libs/all_routing.test.php cake/tests/cases/libs/controller/controller.test.php
cakephp · Nov 16, 2010 · 66e6ec7 · 66e6ec7
2 parents c7fed2e + 293ef95
commit 66e6ec7
Show file tree

Hide file tree

Showing 18 changed files with 1,601 additions and 1,621 deletions.
diff --git a/app/webroot/index.php b/app/webroot/index.php
@@ -65,21 +65,16 @@
 		define('WWW_ROOT', dirname(__FILE__) . DS);
 	}
 	if (!defined('CORE_PATH')) {
-		if (function_exists('ini_set') && ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'))) {
-			define('APP_PATH', null);
-			define('CORE_PATH', null);
-		} else {
-			define('APP_PATH', ROOT . DS . APP_DIR . DS);
-			define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
-		}
+		define('APP_PATH', ROOT . DS . APP_DIR . DS);
+		define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
 	}
 	if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
 		trigger_error("CakePHP core could not be found.  Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
 	}
 	if (isset($_GET['url']) && $_GET['url'] === 'favicon.ico') {
 		return;
 	} else {
-		require CAKE . 'dispatcher.php';
+		require LIBS . 'dispatcher.php';
 		$Dispatcher = new Dispatcher();
-		$Dispatcher->dispatch();
+		$Dispatcher->dispatch(new CakeRequest(isset($_GET['url']) ? $_GET['url'] : null));
 	}
diff --git a/app/webroot/test.php b/app/webroot/test.php
@@ -65,13 +65,8 @@
 	define('WWW_ROOT', dirname(__FILE__) . DS);
 }
 if (!defined('CORE_PATH')) {
-	if (function_exists('ini_set') && ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'))) {
-		define('APP_PATH', null);
-		define('CORE_PATH', null);
-	} else {
-		define('APP_PATH', ROOT . DS . APP_DIR . DS);
-		define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
-	}
+	define('APP_PATH', ROOT . DS . APP_DIR . DS);
+	define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
 }
 if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
 	trigger_error("CakePHP core could not be found.  Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);

diff --git a/cake/bootstrap.php b/cake/bootstrap.php
@@ -29,6 +29,7 @@
 require LIBS . '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';

diff --git a/cake/console/templates/skel/webroot/index.php b/cake/console/templates/skel/webroot/index.php
@@ -65,21 +65,16 @@
 		define('WWW_ROOT', dirname(__FILE__) . DS);
 	}
 	if (!defined('CORE_PATH')) {
-		if (function_exists('ini_set') && ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'))) {
-			define('APP_PATH', null);
-			define('CORE_PATH', null);
-		} else {
-			define('APP_PATH', ROOT . DS . APP_DIR . DS);
-			define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
-		}
+		define('APP_PATH', ROOT . DS . APP_DIR . DS);
+		define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
 	}
 	if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
 		trigger_error("CakePHP core could not be found.  Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
 	}
 	if (isset($_GET['url']) && $_GET['url'] === 'favicon.ico') {
 		return;
 	} else {
-		require CAKE . 'dispatcher.php';
+		require LIBS . 'dispatcher.php';
 		$Dispatcher = new Dispatcher();
-		$Dispatcher->dispatch();
+		$Dispatcher->dispatch(new CakeRequest(isset($_GET['url']) ? $_GET['url'] : null));
 	}
diff --git a/cake/console/templates/skel/webroot/test.php b/cake/console/templates/skel/webroot/test.php
@@ -65,13 +65,8 @@
 	define('WWW_ROOT', dirname(__FILE__) . DS);
 }
 if (!defined('CORE_PATH')) {
-	if (function_exists('ini_set') && ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'))) {
-		define('APP_PATH', null);
-		define('CORE_PATH', null);
-	} else {
-		define('APP_PATH', ROOT . DS . APP_DIR . DS);
-		define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
-	}
+	define('APP_PATH', ROOT . DS . APP_DIR . DS);
+	define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
 }
 if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
 	trigger_error("CakePHP core could not be found.  Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);