Fix Router::promote() & named route table.

Previously promote() only modified the linear list.  It should also
update the routes matching slice of the route table.

lib/Cake/Routing/RouteCollection.php

@@ -175,7 +175,8 @@ public function parse($url) {
 
 /**
  * Promote a route (by default, the last one added) to the beginning of the list.
- * Does not modify route ordering stored in the hashtable lookups.
+ * Also promotes the route to the head of its named slice in the route
+ * hashtable.
  *
  * @param integer $which A zero-based array index representing
  *    the route to move. For example,
@@ -193,6 +194,16 @@ public function promote($which) {
 		$route =& $this->_routes[$which];
 		unset($this->_routes[$which]);
 		array_unshift($this->_routes, $route);
+
+		$name = $route->getName();
+		$routes = $this->_routeTable[$name];
+		foreach ($routes as $i => $otherRoute) {
+			if ($route == $otherRoute) {
+				$index = $i;
+			}
+		}
+		unset($this->_routeTable[$name][$index]);
+		array_unshift($this->_routeTable[$name], $route);
 		return true;
 	}
 

lib/Cake/Routing/Router.php

@@ -430,16 +430,12 @@ public static function prefixes() {
  * @return array Parsed elements from URL
  */
 	public static function parse($url) {
-		$ext = null;
-		$out = array();
-
 		if ($url && strpos($url, '/') !== 0) {
 			$url = '/' . $url;
 		}
 		if (strpos($url, '?') !== false) {
 			$url = substr($url, 0, strpos($url, '?'));
 		}
-
 		return static::$_routes->parse($url);
 	}
 

lib/Cake/Test/TestCase/Routing/RouterTest.php

@@ -2322,4 +2322,22 @@ public function testParseNamedParameters() {
 		$this->assertEquals($expected, $request->params);
 	}
 
+/**
+ * Test promote()
+ *
+ * @return void
+ */
+	public function testPromote() {
+		Router::connect('/:controller/:action/*');
+		Router::connect('/:lang/:controller/:action/*');
+
+		$result = Router::url(['controller' => 'posts', 'action' => 'index', 'lang' => 'en']);
+		$this->assertEquals('/posts/index?lang=en', $result, 'First route should match');
+
+		Router::promote();
+
+		$result = Router::url(['controller' => 'posts', 'action' => 'index', 'lang' => 'en']);
+		$this->assertEquals('/en/posts/index', $result, 'promote() should move 2nd route ahead.');
+	}
+
 }