adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-05 02:52:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renaming connectDefaults to defaults().

Browse source 
Updating tests.
This commit is contained in:
mark_story 2009-11-25 23:39:07 -05:00
parent 636d944e70
commit 1d7881b16f
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cake/libs/router.php
View file

@ -314,13 +314,14 @@ class Router {
/** /**
* Tell router to connect or not connect the default routes. * Tell router to connect or not connect the default routes.
*
* If default routes are disabled all automatic route generation will be disabled * If default routes are disabled all automatic route generation will be disabled
* and you will need to manually configure all the routes you want. * and you will need to manually configure all the routes you want.
* *
* @param boolean $connect Set to true or false depending on whether you want or don't want default routes. * @param boolean $connect Set to true or false depending on whether you want or don't want default routes.
* @return void * @return void
*/ */
function connectDefaults($connect = true) { function defaults($connect = true) {
$_this =& Router::getInstance(); $_this =& Router::getInstance();
$_this->__connectDefaults = $connect; $_this->__connectDefaults = $connect;
} }

14
cake/tests/cases/libs/router.test.php
View file

@ -1965,6 +1965,20 @@ class RouterTest extends CakeTestCase {
$this->assertEqual(Router::getparams(), $expected); $this->assertEqual(Router::getparams(), $expected);
$this->assertEqual(Router::getparams(true), $expected); $this->assertEqual(Router::getparams(true), $expected);
} }
/**
* test that connectDefaults() can disable default route connection
*
* @return void
*/
function testRouterConnectDefaults() {
Router::defaults(false);
Router::connect('/test/*', array('controller' => 'pages', 'action' => 'display', 2));
$result = Router::parse('/posts/edit/5');
$this->assertFalse(isset($result['controller']));
$this->assertFalse(isset($result['action']));
}
} }
/** /**