Fixing issues where route parameters that overlapped could cause rout…

…e compilation errors. Tests added. Fixes #565

cake/libs/router.php

@@ -1348,35 +1348,34 @@ function _writeRoute() {
 			return;
 		}
 		$route = $this->template;
-		$names = $replacements = $search = array();
+		$names = $routeParams = array();
 		$parsed = preg_quote($this->template, '#');
 
 		preg_match_all('#:([A-Za-z0-9_-]+[A-Z0-9a-z])#', $route, $namedElements);
 		foreach ($namedElements[1] as $i => $name) {
+			$search = '\\' . $namedElements[0][$i];
 			if (isset($this->options[$name])) {
 				$option = null;
 				if ($name !== 'plugin' && array_key_exists($name, $this->defaults)) {
 					$option = '?';
 				}
 				$slashParam = '/\\' . $namedElements[0][$i];
 				if (strpos($parsed, $slashParam) !== false) {
-					$replacements[] = '(?:/(?P<' . $name . '>' . $this->options[$name] . ')' . $option . ')' . $option;
-					$search[] = $slashParam;
+					$routeParams[$slashParam] = '(?:/(?P<' . $name . '>' . $this->options[$name] . ')' . $option . ')' . $option;
 				} else {
-					$search[] = '\\' . $namedElements[0][$i];
-					$replacements[] = '(?:(?P<' . $name . '>' . $this->options[$name] . ')' . $option . ')' . $option;
+					$routeParams[$search] = '(?:(?P<' . $name . '>' . $this->options[$name] . ')' . $option . ')' . $option;
 				}
 			} else {
-				$replacements[] = '(?:(?P<' . $name . '>[^/]+))';
-				$search[] = '\\' . $namedElements[0][$i];
+				$routeParams[$search] = '(?:(?P<' . $name . '>[^/]+))';
 			}
 			$names[] = $name;
 		}
 		if (preg_match('#\/\*$#', $route, $m)) {
 			$parsed = preg_replace('#/\\\\\*$#', '(?:/(?P<_args_>.*))?', $parsed);
 			$this->_greedy = true;
 		}
-		$parsed = str_replace($search, $replacements, $parsed);
+		krsort($routeParams);
+		$parsed = str_replace(array_keys($routeParams), array_values($routeParams), $parsed);
 		$this->_compiledRoute = '#^' . $parsed . '[/]*$#';
 		$this->keys = $names;
 	}

cake/tests/cases/libs/router.test.php

@@ -2119,6 +2119,21 @@ function testBasicRouteCompiling() {
 		$this->assertPattern($result, '/test_plugin/posts/edit/5/name:value/nick:name');
 	}
 
+/**
+ * test that route parameters that overlap don't cause errors.
+ *
+ * @return void
+ */
+	function testRouteParameterOverlap() {
+		$route =& new CakeRoute('/invoices/add/:idd/:id', array('controller' => 'invoices', 'action' => 'add'));
+		$result = $route->compile();
+		$this->assertPattern($result, '/invoices/add/1/3');
+
+		$route =& new CakeRoute('/invoices/add/:id/:idd', array('controller' => 'invoices', 'action' => 'add'));
+		$result = $route->compile();
+		$this->assertPattern($result, '/invoices/add/1/3');
+	}
+
 /**
  * test compiling routes with keys that have patterns
  *