adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Route compilation tests passing again.

Browse source
This commit is contained in:
mark_story 2009-11-26 21:42:33 -05:00
parent c4ceeabcf5
commit 89d0ed8f3b
2 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cake/libs/router.php
View file

@ -1276,8 +1276,8 @@ class RouterRoute {
$this->keys = array(); $this->keys = array();
return; return;
} }
$names = $replacements = array(); $names = $replacements = $search = array();
$parsed = $route; $parsed = preg_quote($route, '#');
preg_match_all('#:([A-Za-z0-9_-]+[A-Z0-9a-z])#', $route, $namedElements); preg_match_all('#:([A-Za-z0-9_-]+[A-Z0-9a-z])#', $route, $namedElements);
foreach ($namedElements[1] as $i => $name) { foreach ($namedElements[1] as $i => $name) {
@ -1288,15 +1288,18 @@ class RouterRoute {
} }
$replacements[] = '(?:(' . $params[$name] . ')' . $option . ')' . $option; $replacements[] = '(?:(' . $params[$name] . ')' . $option . ')' . $option;
} else { } else {
$replacements[] = '(?:([^\/]+))?'; $replacements[] = '(?:([^/]+))?';
} }
$search[] = '\\' . $namedElements[0][$i];
$names[] = $name; $names[] = $name;
} }
$parsed = str_replace($namedElements[0], $replacements, $route);
if (preg_match('#\/\*$#', $route)) { $parsed = str_replace($search, $replacements, $parsed);
$parsed = preg_replace('#\/*$#', '(?:/(.*))?', $parsed); if (preg_match('#\/\*$#', $route, $m)) {
$parsed = preg_replace('#/\\\\\*$#', '(?:/(.*))?', $parsed);
} }
$this->_compiledRoute = '#^' . $parsed . '[\/]*$#';
$this->_compiledRoute = '#^' . $parsed . '[/]*$#';
$this->keys = $names; $this->keys = $names;
/* /*
$elements = explode('/', $route); $elements = explode('/', $route);

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

@ -2036,8 +2036,11 @@ class RouterRouteTestCase extends CakeTestCase {
$route =& new RouterRoute('/:controller/:action', array('controller' => 'posts')); $route =& new RouterRoute('/:controller/:action', array('controller' => 'posts'));
$result = $route->compile(); $result = $route->compile();
// $expected = '#^(?:/([^\/]+))?(?:/([^\/]+))?[\/]*$#';
// $this->assertEqual($result, $expected); $this->assertPattern($result, '/posts/edit');
$this->assertPattern($result, '/posts/super_delete');
$this->assertNoPattern($result, '/posts');
$this->assertNoPattern($result, '/posts/super_delete/1');
$route =& new RouterRoute('/posts/foo:id', array('controller' => 'posts', 'action' => 'view')); $route =& new RouterRoute('/posts/foo:id', array('controller' => 'posts', 'action' => 'view'));
$result = $route->compile(); $result = $route->compile();
@ -2055,6 +2058,7 @@ class RouterRouteTestCase extends CakeTestCase {
$this->assertPattern($result, '/test_plugin/posts/edit/5'); $this->assertPattern($result, '/test_plugin/posts/edit/5');
$this->assertPattern($result, '/test_plugin/posts/edit/5/name:value/nick:name'); $this->assertPattern($result, '/test_plugin/posts/edit/5/name:value/nick:name');
} }
/** /**
* test compiling routes with keys that have patterns * test compiling routes with keys that have patterns
* *
@ -2069,10 +2073,6 @@ class RouterRouteTestCase extends CakeTestCase {
$this->assertPattern($result, '/posts/view/518098'); $this->assertPattern($result, '/posts/view/518098');
$this->assertNoPattern($result, '/posts/edit/name-of-post'); $this->assertNoPattern($result, '/posts/edit/name-of-post');
$this->assertNoPattern($result, '/posts/edit/4/other:param'); $this->assertNoPattern($result, '/posts/edit/4/other:param');
// $expected = '#^(?:/([^\/]+))?(?:/([^\/]+))?(?:/([0-9]+)?)?[\/]*$#';
// $this->assertEqual($result, $expected);
$this->assertEqual($route->keys, array('controller', 'action', 'id')); $this->assertEqual($route->keys, array('controller', 'action', 'id'));
$route =& new RouterRoute( $route =& new RouterRoute(
@ -2085,16 +2085,11 @@ class RouterRouteTestCase extends CakeTestCase {
$this->assertPattern($result, '/cze/articles/view/1'); $this->assertPattern($result, '/cze/articles/view/1');
$this->assertNoPattern($result, '/language/articles/view/2'); $this->assertNoPattern($result, '/language/articles/view/2');
$this->assertNoPattern($result, '/eng/articles/view/name-of-article'); $this->assertNoPattern($result, '/eng/articles/view/name-of-article');
// $expected = '#^(?:/([a-z]{3}))(?:/([^\/]+))?(?:/([^\/]+))?(?:/([0-9]+))[\/]*$#';
// $this->assertEqual($result, $expected);
$this->assertEqual($route->keys, array('lang', 'controller', 'action', 'id')); $this->assertEqual($route->keys, array('lang', 'controller', 'action', 'id'));
foreach (array(':', '@', ';', '$', '-') as $delim) { foreach (array(':', '@', ';', '$', '-') as $delim) {
$route =& new RouterRoute('/posts/:id'.$delim.':title'); $route =& new RouterRoute('/posts/:id' . $delim . ':title');
$result = $route->compile(); $result = $route->compile();
//$expected = '#^/posts(?:/([^\/]+))?(?:'.preg_quote($delim, '#').'([^\/]+))?[\/]*$#';
//$this->assertEqual($result, $expected);
$this->assertPattern($result, '/posts/1' . $delim . 'name-of-article'); $this->assertPattern($result, '/posts/1' . $delim . 'name-of-article');
$this->assertPattern($result, '/posts/13244' . $delim . 'name-of_Article[]'); $this->assertPattern($result, '/posts/13244' . $delim . 'name-of_Article[]');
@ -2115,8 +2110,6 @@ class RouterRouteTestCase extends CakeTestCase {
$this->assertNoPattern($result, '/posts/hey_now:nameofarticle'); $this->assertNoPattern($result, '/posts/hey_now:nameofarticle');
$this->assertNoPattern($result, '/posts/:nameofarticle/2009'); $this->assertNoPattern($result, '/posts/:nameofarticle/2009');
$this->assertNoPattern($result, '/posts/:nameofarticle/01'); $this->assertNoPattern($result, '/posts/:nameofarticle/01');
// $this->assertEqual($result, '#^/posts(?:/([0-9]+))(?:\\:([a-z-_]+))(?:/([12][0-9]{3}))[\/]*$#');
$this->assertEqual($route->keys, array('id', 'title', 'year')); $this->assertEqual($route->keys, array('id', 'title', 'year'));
$route =& new RouterRoute( $route =& new RouterRoute(
@ -2130,8 +2123,6 @@ class RouterRouteTestCase extends CakeTestCase {
$this->assertNoPattern($result, '/posts/'); $this->assertNoPattern($result, '/posts/');
$this->assertNoPattern($result, '/posts/nameofarticle'); $this->assertNoPattern($result, '/posts/nameofarticle');
$this->assertNoPattern($result, '/posts/nameofarticle-12347'); $this->assertNoPattern($result, '/posts/nameofarticle-12347');
// $this->assertEqual($result, '#^/posts(?:/([^\/]+))?(?:-\(uuid\:([0-9]+)\))[\/]*$#');
$this->assertEqual($route->keys, array('url_title', 'id')); $this->assertEqual($route->keys, array('url_title', 'id'));
} }