Router tests all pass now.

cakephp · Dec 18, 2010 · 756b098 · 756b098
1 parent 328db0c
commit 756b098
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cake/libs/route/cake_route.php b/cake/libs/route/cake_route.php
@@ -269,6 +269,11 @@ public function match($url) {
 			return false;
 		}
 
+		// Missing defaults is a fail.
+		if (array_diff_key($defaults, $url) !== array()) {
+			return false;
+		}
+
 		$named = $pass = $diff = array();
 
 		foreach ($url as $key => $value) {
@@ -307,7 +312,6 @@ public function match($url) {
 			}
 		}
 
-
 		//if a not a greedy route, no extra params are allowed.
 		if (!$this->_greedy && ( (!empty($pass) || !empty($named)) || array_diff_key($diff, $keyNames) != array()) ) {
 			return false;

diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
@@ -1516,7 +1516,7 @@ function testUrlGenerationWithLegacyPrefixes() {
 
 		$result = Router::url(array('controller' => 'images', 'action' => 'add'));
 		$expected = '/images/add';
-		$this->assertEqual($result, $expected);
+		$this->assertEquals($expected, $result);
 
 		$result = Router::url(array('controller' => 'images', 'action' => 'add', 'protected' => true));
 		$expected = '/protected/images/add';