mark_story
|
3ea8c2246a
|
Merge branch '1.3' into merger
Conflicts:
cake/console/cake.php
cake/dispatcher.php
cake/libs/controller/components/cookie.php
cake/libs/view/helper.php
cake/libs/view/helpers/ajax.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/model/model_validation.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/lib/cake_test_fixture.php
|
2011-03-01 22:21:44 -05:00 |
|
mark_story
|
e05c6cd83f
|
Fixing issue where actions starting with a prefix but not followed by an _ would get mangled when going through router::url().
Fixes #1556
|
2011-02-24 16:43:13 -05:00 |
|
mark_story
|
1c3e1df305
|
Fixing Router::reverse() not correctly working with Request objects that
contained query string parameters.
|
2011-01-20 21:28:50 -05:00 |
|
mark_story
|
dca3fecfed
|
Merge branch '1.3' into merger
Conflicts:
cake/console/error.php
cake/libs/cache/memcache.php
cake/libs/cake_session.php
cake/libs/controller/components/request_handler.php
cake/libs/model/cake_schema.php
cake/libs/router.php
cake/libs/set.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/text.php
cake/libs/view/view.php
cake/tests/cases/libs/set.test.php
|
2011-01-18 20:04:30 -05:00 |
|
Miah Gregory
|
6071788478
|
Updated documentation for Router::connect.
Fixed a few spelling issues as well.
Signed-off-by: mark_story <mark@mark-story.com>
|
2011-01-18 17:54:19 -05:00 |
|
mark_story
|
ee3017599d
|
Merge branch '2.0' into 2.0-pagination
Conflicts:
cake/libs/controller/components/paginator.php
cake/libs/router.php
|
2010-12-24 14:43:11 -05:00 |
|
mark_story
|
ef77e60cb0
|
Removing @subpackage tags, moving contents of @subpackage into @package.
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
|
2010-12-24 14:09:57 -05:00 |
|
mark_story
|
3fc8a1f8c1
|
Removing whitespace.
|
2010-12-24 12:54:18 -05:00 |
|
mark_story
|
af2a5123b5
|
Fixing issue where prefixes would not be correctly loaded for a request.
|
2010-12-21 23:14:17 -05:00 |
|
mark_story
|
d5589d26bd
|
more doc blocks.
|
2010-12-21 22:27:17 -05:00 |
|
mark_story
|
e5588f746c
|
Reversing changes that required a : sigil for named parameters. Also removing ?foo style parameters for querystring args. Having two ways to create querystring args was not sitting well with me.
Tests updated.
|
2010-12-19 23:11:02 -05:00 |
|
mark_story
|
b49b49a5ef
|
Removing named parameter sigils.
|
2010-12-19 22:17:57 -05:00 |
|
mark_story
|
d3fc29c8e8
|
Adding more documentation to connectNamed().
Changing argSeparator -> separator, as it is less typing and easier to remember.
|
2010-12-19 21:49:17 -05:00 |
|
mark_story
|
025ba23886
|
Removing whitespace and adding some more documentation.
|
2010-12-19 20:05:57 -05:00 |
|
mark_story
|
5df2678ba9
|
Fixing named params that were missing the : and fixing Router::reverse() so it adds in the :
|
2010-12-19 17:09:34 -05:00 |
|
mark_story
|
5255b8fc9e
|
Updating doc block for Router::redirect()
Updating RedirectRoute to not use defaults for where the route will redirect.
|
2010-12-18 15:39:10 -05:00 |
|
mark_story
|
328db0c36b
|
Fixed a number of tests, there are still a few issues with prefix routes.
Moved removing defaults that are also keys to the compile step. This
removes quite a few repetitive loops.
|
2010-12-18 14:18:21 -05:00 |
|
mark_story
|
c5bab54125
|
Starting to try and re-factor named params to perform better and be more
explicit with how they are used.
|
2010-12-18 00:15:09 -05:00 |
|
mark_story
|
de7b324444
|
Fixing more strict warnings.
Removing & on component callbacks.
Updating incorrect method signatures.
|
2010-12-18 00:03:03 -05:00 |
|
Jeremy Harris
|
b9143dc7d4
|
Added ControllerTestCase class for testing controllers. Fixes #1244
|
2010-12-14 19:58:27 -08:00 |
|
Jeremy Harris
|
9fa1bec0cb
|
Move Controller::paginate() into PaginatorComponent
|
2010-12-14 18:21:39 -08:00 |
|
mark_story
|
44c080d5ad
|
Making all core classes throw CakeException subclasses, this allows developers to catch framework exceptions with one catch.
Adding package specific exceptions.
Replacing generic exceptions in the codebase with CakeException + package exceptions.
|
2010-12-11 19:26:10 -05:00 |
|
mark_story
|
4e3b62e466
|
Removing vestigial method in App.
Fixing E_STRICT error in Router.
|
2010-11-10 23:43:48 -05:00 |
|
José Lorenzo Rodríguez
|
8c2f9e1d2b
|
Removing E_STRICT errors from router
|
2010-11-08 22:38:30 -04:30 |
|
Jeremy Harris
|
c98306727d
|
Merge branch '2.0-redirect' into 2.0
|
2010-11-07 17:42:04 -08:00 |
|
Jeremy Harris
|
7630580511
|
Added support for redirection routes. Fixes #1151
|
2010-11-07 17:33:05 -08:00 |
|
Juan Basso
|
adb2d90b9a
|
Changed the regex to follow the RFC 3986, working to protocols like "svn+ssh://" and "ed2k://"
|
2010-11-03 01:26:41 -02:00 |
|
Juan Basso
|
b752766d6c
|
Using full base when $url is empty.
|
2010-11-03 01:16:38 -02:00 |
|
Mark Story
|
08e7bcb7ab
|
Merge branch '1.3' into integration
Conflicts:
app/config/core.php
cake/console/libs/acl.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/webroot/test.php
cake/dispatcher.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/log/file_log.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/lib/reporter/cake_cli_reporter.php
|
2010-10-31 21:56:59 -04:00 |
|
Mark Story
|
148870f492
|
Using a simple regexp instead of a strpos to ensure the protocol is at the beginning of the url.
|
2010-10-29 22:10:24 -04:00 |
|
Mark Story
|
3a95a546e8
|
Doing some code cleanup and moving conditionals around.
|
2010-10-29 21:45:09 -04:00 |
|
Mark Story
|
dbce29a058
|
Doing some refactoring, to reduce code duplication.
|
2010-10-29 21:37:03 -04:00 |
|
Mark Story
|
3ca0cdb1ee
|
Adding support for route objects to return full urls. These urls are not changed by Router, and just returned. This will allow subdomain route classes to be created.
Tests added.
|
2010-10-29 21:33:56 -04:00 |
|
mark_story
|
14ec8703c1
|
Removing dirty hack in Router for detecting requestAction.
|
2010-10-29 11:16:50 -04:00 |
|
mark_story
|
67874bd906
|
Fixing issue where defining a pattern for :action would create an optional route parameter that wouldn't respect its pattern.
Added the default action value only when a pattern isn't defined.
Added tests to CakeRoute and Router to cover this case.
Fixes #1197
|
2010-10-14 21:54:44 -04:00 |
|
mark_story
|
f847080cbf
|
Changing more php version strings.
|
2010-10-03 12:46:03 -04:00 |
|
José Lorenzo Rodríguez
|
f63b093d24
|
Merge branch '2.0-request' into 2.0
Still tons of tests failing
Conflicts:
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/request_handler.php
cake/libs/controller/components/security.php
cake/libs/controller/controller.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/html.php
cake/libs/view/view.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/controller/components/auth.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helper.test.php
cake/tests/cases/libs/view/helpers/cache.test.php
cake/tests/cases/libs/view/helpers/form.test.php
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/cases/libs/view/helpers/js.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
|
2010-08-27 23:31:41 -04:30 |
|
mark_story
|
705e90bef7
|
Merge branch '1.3' into 2.0-merge
Conflicts:
cake/libs/cache/memcache.php
cake/libs/cake_session.php
cake/libs/model/behaviors/acl.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/model/behaviors/acl.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
|
2010-08-15 23:09:02 -04:00 |
|
mark_story
|
a04fe5f81d
|
Making Router::reverse() strip out additional framework internal parameters that are specific to requestAction. Refs #977
|
2010-08-04 23:35:49 -04:00 |
|
Juan Basso
|
7e7a2c57e2
|
Fixing changes made in commit 522446e to works with PHP 5.2-. Refs #974
|
2010-08-01 02:55:30 -03:00 |
|
mark_story
|
522446e0c2
|
Fixing issues where route elements could not have '-' in the parameter name because of limitations in pcre named capturing subpatterns. Tests added. Fixes #974
|
2010-07-31 13:03:45 -04:00 |
|
mark_story
|
7c0cda7ce5
|
Merge branch '2.0' into 2.0-request
Conflicts:
cake/libs/router.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/controller/components/auth.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/cases/libs/view/helpers/js.test.php
|
2010-06-28 23:41:48 -04:00 |
|
mark_story
|
94ac914426
|
Changing Router::$__validExtensions so Router::extensions() always returns an array like the doc block says.
Updating test cases for PHPUnit.
|
2010-05-20 22:55:25 -04:00 |
|
mark_story
|
f114d4299d
|
Merge branch '2.0' into 2.0-request
Conflicts:
cake/libs/router.php
cake/tests/cases/libs/router.test.php
|
2010-05-17 21:52:14 -04:00 |
|
predominant
|
8f880731c6
|
Removing closing PHP tags.
|
2010-05-11 08:27:28 +10:00 |
|
predominant
|
1ec220dac2
|
Removing closing PHP tags.
|
2010-05-11 08:07:49 +10:00 |
|
Mark Story
|
e9a7d6d3b9
|
Splitting CakeRoute and PluginShortRoute into their own files. Also splitting out the test cases.
|
2010-05-04 00:35:22 -04:00 |
|
Mark Story
|
f76d320688
|
Making Router a fully static class. Tests updated.
|
2010-05-04 00:26:02 -04:00 |
|
Mark Story
|
e11f7da896
|
Adding support for Router::reverse() to operate on CakeRequest objects.
|
2010-05-02 02:19:32 -04:00 |
|
Mark Story
|
7e25d94258
|
Renaming internals of Router.
Adding tests for legacy setRequestInfo() support.
|
2010-05-02 02:16:16 -04:00 |
|