Mark Story
4421fe6dc3
Fixing issues in router where plugin => null would not always exit a plugin route. Test cases added.
2009-12-08 21:36:25 -05:00
predominant
13ffd76178
Removing "Long description for file" from /cake/libs tree.
2009-12-08 20:19:02 +11:00
mark_story
626f2e86de
Adding trigger_error for incorrect class use.
2009-12-03 21:29:02 -05:00
mark_story
0047ac8f34
Renaming RouterRoute to CakeRoute
2009-12-03 21:20:08 -05:00
mark_story
8c4d389760
Implementing the ability to use custom Route classes when connecting routes. Tests added.
2009-12-03 20:50:13 -05:00
mark_story
218af686d7
Renaming parameters.
2009-12-03 20:32:28 -05:00
mark_story
cc1ba32f50
Removing call to RouterRoute::compile()
2009-12-02 01:10:50 -05:00
mark_story
61b70f1b44
Removing parameters from RouterRoute::_writeRoute().
2009-12-02 00:26:43 -05:00
mark_story
494875cca2
Renaming RouterRouter::$params to $options.
2009-12-02 00:20:51 -05:00
mark_story
728613a34d
Removing use of Set::filter() as its slowish.
2009-12-01 23:05:04 -05:00
mark_story
67ccac1f57
Adding omitted reference operator.
2009-12-01 22:31:18 -05:00
mark_story
63cd1a3326
Renaming method and removing Set::filter() call.
2009-12-01 22:21:33 -05:00
mark_story
78773020d1
Moving route failure handling to a separate method.
2009-12-01 21:56:03 -05:00
mark_story
4c175cc0bc
Removing code.
2009-12-01 21:43:36 -05:00
mark_story
02ed766874
All tests passing in RouterTest.
2009-12-01 21:37:39 -05:00
mark_story
e741e0e4cb
Adding test for previously broken reverse routing feature, where parameters that only partially passed the pattern would be accepted.
2009-12-01 15:04:53 -05:00
mark_story
e36631091d
Fixing a failing test.
2009-12-01 14:58:36 -05:00
mark_story
21dd7fd4ca
Fixing connection of plugin routes, the were being connected in the wrong spot.
...
Moving admin route + plugin tests to correct place.
Fixing order of methods in tests. parse() should only be called after routes are connected otherwise the default routes will precede the custom routes.
2009-12-01 14:39:23 -05:00
mark_story
a8f79f9fe5
Removing defaults that are also keys this makes the actions with the default index key work much better. Also things can't be both a variable and a constant routing parameter.
2009-12-01 13:37:03 -05:00
mark_story
393038816c
More tests passing in RouterTest now.
2009-11-30 10:15:39 -05:00
mark_story
11dd7898c4
Fixing tests + adding tests for passed args order preservation when passed args are part of default route parameters.
2009-11-30 00:23:41 -05:00
mark_story
e41c408378
Adding parameter pattern matching back into RouterRoute::match(), fixes failing tests in RouterRoute test case.
2009-11-29 23:46:02 -05:00
mark_story
5999264f10
Most of RouterRoute::match() working now. Failing tests for params with patterns included.
2009-11-29 22:57:10 -05:00
mark_story
de0b90db4a
Moving addition of plugin and controller keys to Router instead of RouterRoute.
2009-11-29 16:21:33 -05:00
mark_story
9e9559b350
Working on RouterRoute::match(). Adding tests for RouterRoute::match() and removing defaults from routes that don't need defaults.
2009-11-29 16:09:45 -05:00
mark_story
0834cb47ab
Removing code from RouterRoute::__mapRoute. All tests passing.
2009-11-29 12:10:09 -05:00
mark_story
b242dc9531
Moving parameter persist to RouterRoute.
...
Tests updated.
2009-11-29 10:59:38 -05:00
mark_story
f59b8daf2e
Expanding tests for passed arguments in route defaults working correctly. Refactoring passed arguments in route default handling.
2009-11-29 09:49:19 -05:00
mark_story
889e367510
Expanding and correcting doc block for router::connect.
2009-11-28 23:37:40 -05:00
mark_story
7216925394
Updating doc blocks.
2009-11-28 23:12:44 -05:00
mark_story
a86e414adc
Removing Router::stripEscape() and all uses of it.
...
Router::stripEscape() removed escape patterns supported in DboSource. Since those escape patterns no longer exist, neither does the need for the escaping of those patterns.
2009-11-28 23:08:52 -05:00
mark_story
5cbe3dbd39
Removing unused variables. Making loop easier to read.
2009-11-28 21:58:02 -05:00
mark_story
5b4d15dc3b
Removing support for mid route * elements. Mid-route lazy * behaved in a sometimes erratic fashion making routes employing mid-route lazy * hard to depend on.
2009-11-28 21:54:33 -05:00
mark_story
33c67f7c47
More tests passing and more code moved from Router to RouterRoute. Switching RouterRoute to used named capture groups. This simplifies the route processing internals as there are fewer loops used to merge array sets together.
2009-11-28 09:40:15 -05:00
mark_story
4cb055ff0a
Removing tests for features no longer supported. Path elements containing only regular expressions are no longer supported. They did not effectively reverse route. And they provided an inconsistent behavior when combined with the full gamut of regular expressions and routing parameters.
2009-11-27 17:12:35 -05:00
mark_story
49c6cd3f9f
Fixing issues with optional parameters. Allows route params to be made optional by setting a pattern definition.
2009-11-27 09:58:51 -05:00
mark_story
fd98bc5d76
Expanding tests on Router and RouterRoute.
2009-11-26 23:46:42 -05:00
mark_story
89d0ed8f3b
Route compilation tests passing again.
2009-11-26 21:42:33 -05:00
mark_story
c4ceeabcf5
More tests and more passing tests for Route compilation.
...
Basic route compiling complete.
2009-11-26 09:41:05 -05:00
mark_story
6661c2fa70
Starting to refactor RouterRoute::_writeRoute
2009-11-26 00:17:43 -05:00
mark_story
3885466e9a
Changing $_this to the easier to type $self.
2009-11-25 23:40:52 -05:00
mark_story
1d7881b16f
Renaming connectDefaults to defaults().
...
Updating tests.
2009-11-25 23:39:07 -05:00
mark_story
636d944e70
Adding Router::connectDefaults(). Allows the developer to disable Router's automatic generation of routes.
2009-11-25 23:21:10 -05:00
mark_story
52264cb61c
Fixing persistent param route exiting.
...
Adding test for exiting persist param routes.
2009-11-25 23:12:48 -05:00
mark_story
35fac165b3
Merge branch '1.3-misc' into 1.3-router
...
Conflicts:
cake/libs/router.php
2009-11-25 22:57:42 -05:00
mark_story
72c0e2ca5a
Applying minor optimization from 'robustsolution' to Router::connectNamed().
...
Fixes #312
2009-11-24 09:27:13 -05:00
mark_story
4d37e75f18
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/controller/components/cookie.php
cake/libs/debugger.php
cake/libs/flay.php
cake/libs/http_socket.php
cake/libs/inflector.php
cake/libs/model/cake_schema.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo_source.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
Juan Basso
df9e1e0bd1
Replace function join (alias) by implode.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05:00
predominant
97239f0259
Adding newline.
2009-11-18 22:28:03 +11:00
mark_story
9eb1950646
Removing duplicate condition check. Fixes #314
2009-11-16 20:10:08 -05:00
Jippi
e6801c22e1
Merge branch '1.3' of code.cakephp.org:cakephp into 1.3
2009-11-16 23:19:11 +00:00
Jippi
f078b0aeda
Fixed Router::url() not being able to leave an URL with persist parameters
2009-11-16 23:16:49 +00:00
mark_story
acd2c15690
Merge branch '1.3-misc' into 1.3-merger
...
Conflicts:
cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -05:00
mark_story
58383d3cb9
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/model.php
2009-11-15 20:05:55 -05:00
mark_story
2740fd6714
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-14 19:42:24 -05:00
mark_story
3712072531
Applying optimization to Router::connect() from 'robustsolution' Fixes #302
2009-11-14 16:32:18 -05:00
mark_story
8b1a2b1f72
Applying optimization in Router::__parseExtension from 'robustsolution'. Fixes #301
2009-11-14 16:29:33 -05:00
predominant
0977b3fe15
Standardising docblock endings throughout.
2009-11-14 23:19:25 +11:00
predominant
384bb7a0e0
Update license lines throughout.
2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed
Fixing links throughout
2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8
Removing excess whitespace
2009-11-06 17:08:23 +11:00
predominant
6782cb019c
Update CakePHP Project link.
2009-11-06 17:00:11 +11:00
predominant
1b9b0aae5e
Updating Copyright date to include 2009.
2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7
Removing @filesource
2009-11-06 15:24:02 +11:00
mark_story
88ef00d2d0
Removing trailing whitespace.
2009-11-04 23:05:25 -05:00
mark_story
4cb88ab1bb
Expanding tests for RouterRoute route compilation.
2009-11-04 23:03:08 -05:00
mark_story
8ebd3ed410
Removing params that are not part of $url.
2009-11-04 23:03:08 -05:00
mark_story
aeb61f3750
Continuing to refactor Router methods into RouterRoute.
...
Fixed issues with some routes having trailing / and others not.
All existing router tests are passing.
2009-11-04 23:03:08 -05:00
mark_story
cc5c5a5ac9
RouterRoute now being used instead or route arrays.
...
Still some failing tests, mostly due to trailing /
2009-11-04 23:03:08 -05:00
mark_story
6da1ab9c30
Moving matching and parsing methods into RouterRoute.
2009-11-04 23:03:08 -05:00
mark_story
fec83abd90
Starting refactoring of Route methods into a separate class. Tests added.
2009-11-04 23:03:08 -05:00
mark_story
ed2e20ed23
Merge branch '1.3-misc' into 1.3
2009-10-02 13:18:12 -04:00
mark_story
cba8871f16
Adding tests so that adding one prefix removes other prefixes. Making it so you can only have one prefix at a time in a route. Also simplifies prefix switching.
2009-09-30 10:19:43 -04:00
mark_story
d2b4e33e1b
Adding break; to escape out of prefix checking, optimizes operations with many prefixes.
2009-09-30 10:01:08 -04:00
mark_story
893e177909
Fixing isset() checks in Router to test for empty values instead.
...
Updating prefix use in paginator helper test.
2009-09-30 00:50:15 -04:00
mark_story
17782f71b3
Removing internal magic 'id' param. It behaved inconsistently in that it defaulted into the passed parameters, even though it was input as a named/routed parameter. This change makes 'id' a regular routed/named parameter.
2009-09-29 22:53:17 -04:00
mark_story
c69410d809
Removing static call, and replacing with instance method call.
2009-09-27 16:31:56 -04:00
mark_story
76c1c1cb8e
Implementing Routing.prefixes.
...
Replaces Routing.admin and streamlines the use of Routing prefixes so they behave more consistently with admin routing.
2009-09-27 00:12:03 -04:00
mark_story
3e394f1fa8
Adding test cases for Routing.prefixes.
2009-09-26 22:48:57 -04:00
mark_story
3904c6f7b5
Adding constructor to Router.
...
Adding __setPrefixes to initialize prefixes and merge Routing.admin with new Routing.prefixes.
2009-09-26 22:37:19 -04:00
mark_story
2f46f39225
Removing subclassing of Object.
2009-09-26 22:24:24 -04:00
mark_story
cf849e3cf8
Removing svn tags.
2009-09-26 22:22:43 -04:00
mark_story
5717e3b59c
Merge branch '1.2' into 1.2-merger
...
Conflicts:
app/webroot/test.php
cake/VERSION.txt
cake/bootstrap.php
cake/config/config.php
cake/console/cake.php
cake/console/libs/schema.php
cake/console/templates/skel/webroot/test.php
cake/libs/configure.php
cake/tests/cases/console/libs/schema.test.php
cake/tests/cases/libs/debugger.test.php
cake/tests/cases/libs/model/model_write.test.php
cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
mark_story
bcbdb1cf1d
Fixing issue where admin revere routing was possibly unsuccessful due to differences in action param between route and url arrays. Fixes #44 and #6173
2009-09-05 01:06:18 -04:00
gwoo
1423b0067b
Merge branch '1.2' into 1.3
2009-07-30 11:34:33 -07:00
DarkAngelBGE
9da7b6ef55
Bringing Router coverage up to 94.45%, minor router refactorings
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8258 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 09:49:27 +00:00
gwoo
062f471b7f
updating App::import usage. ran each test and everything seems ok.
2009-07-25 18:27:02 -07:00
AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
gwoo
a9d98e73c3
Merge branch '1.2' into 1.3
2009-07-22 09:27:31 -07:00
DarkAngelBGE
07096f3bcc
fixes #6403 , removing unreachable code in router
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8247 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-22 14:37:50 +00:00
DarkAngelBGE
d6a12ce5f1
2nd param init value for Router::stripPlugin(), improving router's coverage by adding tests for stripPlugin()
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8245 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-22 13:02:31 +00:00
mark_story
d2245fd514
Fixing Router::normalize() so that a url containing the base param more than once, which is passed into normalize() multiple times does not get url segments removed. Fixes #6338 and #5978
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8236 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-20 13:18:38 +00:00
mark_story
74fd4849ba
Fixing issue in Router where generating plugin shortcut controller routes with admin prefixes left a :controller param behind. Fixes #6252
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8235 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-17 21:35:23 +00:00
gwoo
c3643767bf
some more updates to path handling
2009-06-10 16:13:39 -07:00
nate
cb95f13608
Correcting issue in String::insert() where 0 offsets were handled incorrectly, affecting issue where values were not properly quoted and inserted into conditions strings. Fixes #6163 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8085 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-09 20:03:02 +00:00
gwoo
9217a85281
adding router test and patch for plugin reverse routing
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8041 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-17 18:26:37 +00:00
mark_story
4b00c29eef
Updating doc blocks to improve readability in API.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8015 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-04 05:00:59 +00:00
mark_story
7c87d36d74
Updating Router::queryString() and Router::url() to allow additional parameters to force escaping of & used in query strings. Tests added. Refs #5982
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7987 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 21:38:11 +00:00
gwoo
6026e75009
fixing preg error in Router::normalize cause by last commit
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7984 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 18:27:14 +00:00
gwoo
52318f9d17
fixes #5978 , Router::normalize url generation
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7981 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 17:55:48 +00:00