Removing Dispatcher::$here, it wasn't really used outside of a cached…

…() which had a param that it just ignored. Making Dispatcher::cached() pay attention to its parameter. Updating tests.
cakephp · Mar 3, 2011 · a6abd61 · a6abd61
1 parent af16b13
commit a6abd61
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 27 deletions.
diff --git a/cake/libs/dispatcher.php b/cake/libs/dispatcher.php
@@ -37,14 +37,6 @@
  */
 class Dispatcher {
 
-/**
- * Current URL
- *
- * @var string
- * @access public
- */
-	public $here = false;
-
 /**
  * The request object
  *
@@ -91,9 +83,7 @@ public function __construct($url = null, $base = false) {
  *    are encountered.
  */
 	public function dispatch(CakeRequest $request, $additionalParams = array()) {
-		$this->here = $request->here;
-
-		if ($this->asset($request->url) || $this->cached($request->url)) {
+		if ($this->asset($request->url) || $this->cached($request->here)) {
 			return;
 		}
 
@@ -260,12 +250,11 @@ protected function _loadRoutes() {
 /**
  * Outputs cached dispatch view cache
  *
- * @param string $url Requested URL
+ * @param string $path Requested URL path
  */
-	public function cached($url) {
+	public function cached($path) {
 		if (Configure::read('Cache.check') === true) {
-			$path = $this->here;
-			if ($this->here == '/') {
+			if ($path == '/') {
 				$path = 'home';
 			}
 			$path = strtolower(Inflector::slug($path));

diff --git a/cake/tests/cases/libs/dispatcher.test.php b/cake/tests/cases/libs/dispatcher.test.php
@@ -1424,7 +1424,7 @@ public function testFullPageCachingDispatch() {
 		$out = ob_get_clean();
 
 		ob_start();
-		$dispatcher->cached($request);
+		$dispatcher->cached($request->here);
 		$cached = ob_get_clean();
 
 		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
@@ -1433,7 +1433,7 @@ public function testFullPageCachingDispatch() {
 
 		$this->assertEqual($result, $expected);
 
-		$filename = $this->__cachePath($dispatcher->here);
+		$filename = $this->__cachePath($request->here);
 		unlink($filename);
 
 		$request = new CakeRequest('test_cached_pages/index');
@@ -1446,15 +1446,15 @@ public function testFullPageCachingDispatch() {
 		$out = ob_get_clean();
 
 		ob_start();
-		$dispatcher->cached($request);
+		$dispatcher->cached($request->here);
 		$cached = ob_get_clean();
 
 		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
 		$cached = preg_replace('/<!--+[^<>]+-->/', '', $cached);
 		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $cached);
 
 		$this->assertEqual($result, $expected);
-		$filename = $this->__cachePath($dispatcher->here);
+		$filename = $this->__cachePath($request->here);
 		unlink($filename);
 
 		$request = new CakeRequest('TestCachedPages/index');
@@ -1464,15 +1464,15 @@ public function testFullPageCachingDispatch() {
 		$out = ob_get_clean();
 
 		ob_start();
-		$dispatcher->cached($request);
+		$dispatcher->cached($request->here);
 		$cached = ob_get_clean();
 
 		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
 		$cached = preg_replace('/<!--+[^<>]+-->/', '', $cached);
 		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $cached);
 
 		$this->assertEqual($result, $expected);
-		$filename = $this->__cachePath($dispatcher->here);
+		$filename = $this->__cachePath($request->here);
 		unlink($filename);
 
 		$request = new CakeRequest('TestCachedPages/test_nocache_tags');
@@ -1482,15 +1482,15 @@ public function testFullPageCachingDispatch() {
 		$out = ob_get_clean();
 
 		ob_start();
-		$dispatcher->cached($request);
+		$dispatcher->cached($request->here);
 		$cached = ob_get_clean();
 
 		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
 		$cached = preg_replace('/<!--+[^<>]+-->/', '', $cached);
 		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $cached);
 
 		$this->assertEqual($result, $expected);
-		$filename = $this->__cachePath($dispatcher->here);
+		$filename = $this->__cachePath($request->here);
 		unlink($filename);
 
 		$request = new CakeRequest('test_cached_pages/view/param/param');
@@ -1500,15 +1500,15 @@ public function testFullPageCachingDispatch() {
 		$out = ob_get_clean();
 
 		ob_start();
-		$dispatcher->cached($request);
+		$dispatcher->cached($request->here);
 		$cached = ob_get_clean();
 
 		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
 		$cached = preg_replace('/<!--+[^<>]+-->/', '', $cached);
 		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $cached);
 
 		$this->assertEqual($result, $expected);
-		$filename = $this->__cachePath($dispatcher->here);
+		$filename = $this->__cachePath($request->here);
 		unlink($filename);
 
 		$request = new CakeRequest('test_cached_pages/view/foo:bar/value:goo');
@@ -1518,15 +1518,15 @@ public function testFullPageCachingDispatch() {
 		$out = ob_get_clean();
 
 		ob_start();
-		$dispatcher->cached($request);
+		$dispatcher->cached($request->here);
 		$cached = ob_get_clean();
 
 		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
 		$cached = preg_replace('/<!--+[^<>]+-->/', '', $cached);
 		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $cached);
 
 		$this->assertEqual($result, $expected);
-		$filename = $this->__cachePath($dispatcher->here);
+		$filename = $this->__cachePath($request->here);
 		$this->assertTrue(file_exists($filename));
 
 		unlink($filename);