Adding parameter pattern matching back into RouterRoute::match(), fix…

…es failing tests in RouterRoute test case.
cakephp · Nov 30, 2009 · e41c408 · e41c408
1 parent 5999264
commit e41c408
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/cake/libs/router.php b/cake/libs/router.php
@@ -1384,7 +1384,6 @@ function match($url) {
 		$passedArgsAndParams = array_diff_key($diff, $this->defaults, $keyNames);
 		list($named, $params) = Router::getNamedElements($passedArgsAndParams, $url['controller'], $url['action']);
 
-
 		//remove any pass params, they have numeric indexes
 		$pass = array();
 		$i = 0;
@@ -1393,8 +1392,16 @@ function match($url) {
 			unset($url[$i]);
 			$i++;
 		}
-		return $this->_writeUrl(array_merge($url, compact('pass', 'named', 'prefix')));
 
+		//check patterns for routed params
+		if (!empty($this->params)) {
+			foreach ($this->params as $key => $pattern) {
+				if (array_key_exists($key, $url) && !preg_match('#' . $pattern . '#', $url[$key])) {
+					return false;
+				}
+			}
+		}
+		return $this->_writeUrl(array_merge($url, compact('pass', 'named', 'prefix')));
 
 //*/
 /*
@@ -1426,12 +1433,7 @@ function match($url) {
 				unset($params[$key]);
 			}
 		}
-		debug($params);
 		list($named, $params) = Router::getNamedElements($params);
-		debug($named);
-		debug($params);
-		debug($this);
-		echo '-----------<br>';
 
 		if (!strpos($this->template, '*') && (!empty($pass) || !empty($named))) {
 			return false;

diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
@@ -1948,7 +1948,7 @@ function testRouterConnectDefaults() {
 	}
 }
 
-SimpleTest::ignore('RouterTest');
+// SimpleTest::ignore('RouterTest');
 // SimpleTest::ignore('RouterRouteTestCase');
 /**
  * Test case for RouterRoute