adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 18:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

2nd param init value for Router::stripPlugin(), improving router's coverage by adding tests for stripPlugin()

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8245 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
DarkAngelBGE 2009-07-22 13:02:31 +00:00
parent ecd001547d
commit d6a12ce5f1
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cake/libs/router.php
View file

@ -1245,7 +1245,7 @@ class Router extends Object {
* @access public * @access public
* @static * @static
*/ */
function stripPlugin($base, $plugin) { function stripPlugin($base, $plugin = null) {
if ($plugin != null) { if ($plugin != null) {
$base = preg_replace('/(?:' . $plugin . ')/', '', $base); $base = preg_replace('/(?:' . $plugin . ')/', '', $base);
$base = str_replace('//', '', $base); $base = str_replace('//', '', $base);
@ -1258,7 +1258,6 @@ class Router extends Object {
} }
return $base; return $base;
} }
/** /**
* Strip escape characters from parameter values. * Strip escape characters from parameter values.
* *

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

@ -1655,5 +1655,20 @@ class RouterTest extends CakeTestCase {
$expected = '/test/test_another_action/locale:badness'; $expected = '/test/test_another_action/locale:badness';
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
} }
/**
* testStripPlugin
*
* @return void
* @access public
*/
function testStripPlugin() {
$pluginName = 'forums';
$url = 'example.com/' . $pluginName . '/';
$expected = 'example.com';
$this->assertEqual(Router::stripPlugin($url, $pluginName), $expected);
$this->assertEqual(Router::stripPlugin($url), $url);
$this->assertEqual(Router::stripPlugin($url, null), $url);
}
} }
?> ?>