Skip to content

Commit 1d7881b

Browse files
committed
Renaming connectDefaults to defaults().
Updating tests.
1 parent 636d944 commit 1d7881b

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

cake/libs/router.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,13 +314,14 @@ function connectNamed($named, $options = array()) {
314314

315315
/**
316316
* Tell router to connect or not connect the default routes.
317+
*
317318
* If default routes are disabled all automatic route generation will be disabled
318319
* and you will need to manually configure all the routes you want.
319320
*
320321
* @param boolean $connect Set to true or false depending on whether you want or don't want default routes.
321322
* @return void
322323
*/
323-
function connectDefaults($connect = true) {
324+
function defaults($connect = true) {
324325
$_this =& Router::getInstance();
325326
$_this->__connectDefaults = $connect;
326327
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1965,6 +1965,20 @@ function testGetParams() {
19651965
$this->assertEqual(Router::getparams(), $expected);
19661966
$this->assertEqual(Router::getparams(true), $expected);
19671967
}
1968+
1969+
/**
1970+
* test that connectDefaults() can disable default route connection
1971+
*
1972+
* @return void
1973+
*/
1974+
function testRouterConnectDefaults() {
1975+
Router::defaults(false);
1976+
Router::connect('/test/*', array('controller' => 'pages', 'action' => 'display', 2));
1977+
$result = Router::parse('/posts/edit/5');
1978+
$this->assertFalse(isset($result['controller']));
1979+
$this->assertFalse(isset($result['action']));
1980+
1981+
}
19681982
}
19691983

19701984
/**

0 commit comments

Comments
 (0)