Refactored CakeRoute::match() to not use Set::diff(). This was the sl…

…owest part of reverse routing and this change should make things faster.

Added additional tests for the 0 edge case.

cake/libs/route/cake_route.php

@@ -263,27 +263,40 @@ public function match($url) {
 		if (array_intersect_key($keyNames, $url) != $keyNames) {
 			return false;
 		}
-
-		//pull out named params so comparisons later on are faster.
-		$named = array();
+
+		$named = $pass = $diff = array();
 		foreach ($url as $key => $value) {
+			// pull out named params so comparisons later on are faster.
 			if ($key[0] === ':') {
-				$named[$key] = $value;
+				$named[substr($key, 1)] = $value;
 				unset($url[$key]);
+				continue;
 			}
-		}
-
-		$diffUnfiltered = Set::diff($url, $defaults);
-		$diff = array();
 
-		foreach ($diffUnfiltered as $key => $var) {
-			if ($var === 0 || $var === '0' || !empty($var)) {
-				$diff[$key] = $var;
+			// keys that exist in the defaults and have different values cause match failures.
+			$keyExists = array_key_exists($key, $defaults);
+			if ($keyExists && $defaults[$key] != $value) {
+				$diff[$key] = $value;
+				continue;
+			}
+			// keys that don't exist are different.
+			if (!$keyExists) {
+				$diff[$key] = $value;
+			}
+
+			// pull out passed args
+			$numeric = is_numeric($key);
+			if ($numeric && isset($defaults[$key]) && $defaults[$key] == $value) {
+				continue;
+			} elseif ($numeric) {
+				$pass[] = $value;
+				unset($url[$key]);
+				continue;
 			}
 		}
 
 		//if a not a greedy route, no extra params are allowed.
-		if (!$this->_greedy && array_diff_key($diff, $keyNames) != array()) {
+		if (!$this->_greedy && (!empty($pass) || array_diff_key($diff, $keyNames) != array())) {
 			return false;
 		}
 
@@ -294,26 +307,10 @@ public function match($url) {
 		$filteredDefaults = array_filter($defaults);
 
 		//if the difference between the url diff and defaults contains keys from defaults its not a match
-		if (array_intersect_key($filteredDefaults, $diffUnfiltered) !== array()) {
+		if (array_intersect_key($filteredDefaults, $diff) !== array()) {
 			return false;
 		}
 
-		$passedArgsAndParams = array_diff_key($diff, $filteredDefaults, $keyNames) + $named;
-		list($named, $params) = Router::getNamedElements($passedArgsAndParams, $url['controller'], $url['action']);
-
-		//remove any pass params, they have numeric indexes, skip any params that are in the defaults
-		$pass = array();
-		$i = 0;
-		while (isset($url[$i])) {
-			if (!isset($diff[$i])) {
-				$i++;
-				continue;
-			}
-			$pass[] = $url[$i];
-			unset($url[$i], $params[$i]);
-			$i++;
-		}
-
 		//still some left over parameters that weren't named or passed args, bail.
 		if (!empty($params)) {
 			return false;

cake/tests/cases/libs/route/cake_route.test.php

@@ -304,6 +304,12 @@ function testMatchWithNamedParametersAndPassedArgs() {
 		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5));
 		$this->assertEqual($result, '/posts/view/5');
 
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 0));
+		$this->assertEqual($result, '/posts/view/0');
+
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, '0'));
+		$this->assertEqual($result, '/posts/view/0');
+
 		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5, ':page' => 1, ':limit' => 20, ':order' => 'title'));
 		$this->assertEqual($result, '/posts/view/5/page:1/limit:20/order:title');