Commit graph

243 commits

Author SHA1 Message Date
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
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