Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixing issues in router where plugin => null would not always exit a …

…plugin route. Test cases added.
  • Loading branch information...
commit 4421fe6dc3590081ce84f68752afcbcbe484144b 1 parent efa36ab
@markstory markstory authored
Showing with 63 additions and 20 deletions.
  1. +10 −9 cake/libs/router.php
  2. +53 −11 cake/tests/cases/libs/router.test.php
View
19 cake/libs/router.php
@@ -228,13 +228,13 @@ function getNamedExpressions() {
* Examples:
*
* `Router::connect('/:controller/:action/*');`
- *
+ *
* The first parameter will be used as a controller name while the second is used as the action name.
* the '/*' syntax makes this route greedy in that it will match requests like `/posts/index` as well as requests
- * like `/posts/edit/1/foo/bar`.
+ * like `/posts/edit/1/foo/bar`.
*
* `Router::connect('/home-page', array('controller' => 'pages', 'action' => 'display', 'home'));`
- *
+ *
* The above shows the use of route parameter defaults. And providing routing parameters for a static route.
*
* {{{
@@ -251,8 +251,8 @@ function getNamedExpressions() {
* @param string $route A string describing the template of the route
* @param array $defaults An array describing the default route parameters. These parameters will be used by default
* and can supply routing parameters that are not dynamic. See above.
- * @param array $options An array matching the named elements in the route to regular expressions which that
- * element should match. Also contains additional parameters such as which routed parameters should be
+ * @param array $options An array matching the named elements in the route to regular expressions which that
+ * element should match. Also contains additional parameters such as which routed parameters should be
* shifted into the passed arguments. As well as supplying patterns for routing parameters.
* @see routes
* @return array Array of routes
@@ -1374,6 +1374,7 @@ function match($url) {
$diffUnfiltered = Set::diff($url, $defaults);
$diff = array();
+
foreach ($diffUnfiltered as $key => $var) {
if ($var === 0 || $var === '0' || !empty($var)) {
$diff[$key] = $var;
@@ -1386,14 +1387,13 @@ function match($url) {
}
//remove defaults that are also keys. They can cause match failures
- $count = count($this->keys);
- while ($count--) {
- unset($defaults[$this->keys[$count]]);
+ foreach ($this->keys as $key) {
+ unset($defaults[$key]);
}
$filteredDefaults = array_filter($defaults);
//if the difference between the url diff and defaults contains keys from defaults its not a match
- if (array_intersect_key($filteredDefaults, $diff) !== array()) {
+ if (array_intersect_key($filteredDefaults, $diffUnfiltered) !== array()) {
return false;
}
@@ -1405,6 +1405,7 @@ function match($url) {
}
$i++;
}
+
$passedArgsAndParams = array_diff_key($diff, $filteredDefaults, $keyNames);
list($named, $params) = Router::getNamedElements($passedArgsAndParams, $url['controller'], $url['action']);
View
64 cake/tests/cases/libs/router.test.php
@@ -391,7 +391,7 @@ function testUrlGenerationBasic() {
Router::reload();
Router::connect('/:controller/:action/:id', array(), array('id' => $ID));
Router::parse('/');
-
+
$result = Router::url(array('controller' => 'posts', 'action' => 'view', 'id' => '1'));
$expected = '/posts/view/1';
$this->assertEqual($result, $expected);
@@ -770,7 +770,7 @@ function testUrlGenerationWithExtensions() {
* @access public
* @return void
*/
- function testPluginUrlGeneration() {
+ function testUrlGenerationPlugins() {
Router::setRequestInfo(array(
array(
'controller' => 'controller', 'action' => 'index', 'form' => array(),
@@ -785,17 +785,17 @@ function testPluginUrlGeneration() {
$this->assertEqual(Router::url('read/1'), '/base/test/controller/read/1');
Router::reload();
-
Router::connect('/:lang/:plugin/:controller/*', array('action' => 'index'));
Router::setRequestInfo(array(
- array(
- 'lang' => 'en',
- 'plugin' => 'shows', 'controller' => 'shows', 'action' => 'index', 'pass' =>
- array(), 'form' => array(), 'url' =>
- array('url' => 'en/shows/')),
- array('plugin' => NULL, 'controller' => NULL, 'action' => NULL, 'base' => '',
- 'here' => '/en/shows/', 'webroot' => '/')));
+ array(
+ 'lang' => 'en',
+ 'plugin' => 'shows', 'controller' => 'shows', 'action' => 'index', 'pass' =>
+ array(), 'form' => array(), 'url' =>
+ array('url' => 'en/shows/')),
+ array('plugin' => NULL, 'controller' => NULL, 'action' => NULL, 'base' => '',
+ 'here' => '/en/shows/', 'webroot' => '/')
+ ));
Router::parse('/en/shows/');
@@ -808,6 +808,48 @@ function testPluginUrlGeneration() {
}
/**
+ * test that you can leave active plugin routes with plugin = null
+ *
+ * @return void
+ */
+ function testCanLeavePlugin() {
+ Router::reload();
+ Router::connect(
+ '/admin/other/:controller/:action/*',
+ array(
+ 'admin' => 1,
+ 'plugin' => 'aliased',
+ 'prefix' => 'admin'
+ )
+ );
+ Router::setRequestInfo(array(
+ array(
+ 'pass' => array(),
+ 'admin' => true,
+ 'prefix' => 'admin',
+ 'plugin' => 'this',
+ 'action' => 'admin_index',
+ 'controller' => 'interesting',
+ 'url' => array('url' => 'admin/this/interesting/index'),
+ ),
+ array(
+ 'base' => '',
+ 'here' => '/admin/this/interesting/index',
+ 'webroot' => '/',
+ 'passedArgs' => array(),
+ )
+ ));
+ $result = Router::url(array('plugin' => null, 'controller' => 'posts', 'action' => 'index'));
+ $this->assertEqual($result, '/admin/posts');
+
+ $result = Router::url(array('controller' => 'posts', 'action' => 'index'));
+ $this->assertEqual($result, '/admin/this/posts');
+
+ $result = Router::url(array('plugin' => 'aliased', 'controller' => 'posts', 'action' => 'index'));
+ $this->assertEqual($result, '/admin/other/posts/index');
+ }
+
+/**
* testUrlParsing method
*
* @access public
@@ -1147,7 +1189,7 @@ function testPrefixRoutingAndPlugins() {
$result = Router::url(array('plugin' => 'test_plugin', 'controller' => 'test_plugin', 'action' => 'index'));
$expected = '/admin/test_plugin';
$this->assertEqual($result, $expected);
-
+
Router::reload();
Router::parse('/');
Router::setRequestInfo(array(
Please sign in to comment.
Something went wrong with that request. Please try again.