mark_story
|
b70a512470
|
Moving Router::$named to be protected, and adding an accessor method. This will help with later refactoring.
|
2011-03-02 22:08:30 -05:00 |
|
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
|
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
|
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
|
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
|
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
|
7c6af5bfec
|
Making a test actually test what its supposed to.
|
2010-12-18 17:01:26 -05:00 |
|
mark_story
|
756b09849f
|
Router tests all pass now.
|
2010-12-18 14:26:45 -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 |
|
Jeremy Harris
|
9fa1bec0cb
|
Move Controller::paginate() into PaginatorComponent
|
2010-12-14 18:21:39 -08:00 |
|
mark_story
|
0ac8d04241
|
Fixing more strict warnings.
|
2010-12-12 21:02:42 -05:00 |
|
mark_story
|
d12c232d8a
|
Merge branch '1.3' into merger
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
cake/tests/lib/cake_test_case.php
|
2010-11-16 21:48:13 -05:00 |
|
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 |
|
ADmad
|
81ce6f40b9
|
Added test cases showing usage of 'full_base' key for url generation. Refs #1256
|
2010-11-04 17:59:23 +05:30 |
|
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 |
|
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
|
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
|
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
|
3ab77017ae
|
Fixing OpenTest license mentions to use MIT License
Fixing PHP versions 4 and 5 to only be PHP5.
|
2010-10-03 12:31:21 -04:00 |
|
mark_story
|
b908365f9d
|
Changing the @license tag on test files, as tests can now be MIT like
the rest of CakePHP.
|
2010-10-03 12:27:27 -04:00 |
|
mark_story
|
92b57d81ee
|
Moving common setup and teardown functionality in to CakeTestCase.
Removing repeated setup/teardown logic from test cases.
Switching tests to use setup/teardown instead of startTest/endTest.
|
2010-09-25 21:36:49 -04:00 |
|
mark_story
|
53086635b3
|
Adding CakeRequest and CakeResponse to the routing group.
Making more tests not fail in cli.
|
2010-09-24 23:30:01 -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 |
|
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
|
86cae09d79
|
Merge branch '1.3' of github.com:cakephp/cakephp into 1.3
|
2010-07-31 11:59:21 -04:00 |
|
ADmad
|
d04b327469
|
Fixing test case as it was error prone. Assuming the first value of $plugins array to be 'plugin_js' was incorrect.
|
2010-07-31 21:08:10 +05:30 |
|
mark_story
|
5efddf9a41
|
Adding a test case for route params with hyphens. Refs #974
|
2010-07-31 11:23:02 -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
|
ecf7811b7a
|
Merge branch '2.0' into 2.0-request
Conflicts:
cake/dispatcher.php
cake/libs/controller/components/request_handler.php
cake/libs/view/helpers/form.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/view/helpers/js.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
|
2010-06-27 23:21:11 -04:00 |
|
mark_story
|
aee1c5483b
|
Renaming test case classes to better reflect the filenames.
|
2010-06-13 10:06:00 -04:00 |
|
mark_story
|
fc79dc6232
|
Merge branch '2.0' into 2.0-phpunit
Conflicts:
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/libs/code_coverage_manager.test.php
cake/tests/cases/libs/view/helpers/js.test.php
cake/tests/lib/code_coverage_manager.php
|
2010-05-30 22:13:09 -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 |
|
predominant
|
6a18b2bc1d
|
Merge remote branch 'origin/1.3' into 2.0
Conflicts:
cake/basics.php
cake/console/libs/shell.php
cake/console/libs/tasks/controller.php
cake/libs/controller/components/request_handler.php
cake/libs/model/model.php
cake/libs/model/model_behavior.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/sanitize.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/javascript.php
cake/libs/view/pages/home.ctp
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/test_app/libs/cache/test_app_cache.php
cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
|
2010-05-20 12:22:04 +10:00 |
|
Juan Basso
|
a94b9ee95b
|
Update various links. Closes #392
|
2010-05-18 22:15:13 -03: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
|
adf604a966
|
Merge branch '1.3' into 2.0
Conflicts:
cake/console/templates/default/actions/controller_actions.ctp
cake/console/templates/default/views/form.ctp
cake/console/templates/default/views/index.ctp
cake/console/templates/default/views/view.ctp
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/view/pages/home.ctp
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/model/cake_schema.test.php
|
2010-05-02 17:53:42 -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 |
|
Mark Story
|
26279851e1
|
Making Router::setRequestInfo() able to accept arrays. It will convert older style arrays into a CakeRequest object for later use.
Updating uses of Router::setRequestInfo() to just pass the object where possible.
|
2010-05-02 01:59:56 -04:00 |
|
Mark Story
|
e336df6de8
|
Updating some uses of Router::setRequestInfo().
|
2010-05-02 01:43:37 -04:00 |
|
Mark Story
|
a691edbcff
|
Adding tests for passed arguments with dots when parseExtensions() has been called. Refs #620
|
2010-04-29 00:20:35 -04:00 |
|