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
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
bd1365f8ae
Changing interactions inside Router so it doesn't need a CakeRequest object, makes changes to Router test not necessary.
2010-05-02 00:29:35 -04:00
Mark Story
d2ea077b81
Moving parameter parsing below asset dispatching, should speed up asset dispatching.
...
Updating + fixing tests to reflect API changes and fixing some issues where router was breaking assets.
2010-05-01 23:19:47 -04:00
Mark Story
2b08ad6012
Updating fatal tests in Dispatcher tests. Updating Router to use a method instead of a raw array_merge.
2010-05-01 11:07:32 -04:00
Mark Story
fbd70bf23c
Making Dispatcher::parseParams require a CakeRequest object instead of as string url. Updating tests in the Dispatcher, and fixing an issue where POST params would be wiped out by Router.
2010-05-01 10:48:30 -04:00
Mark Story
ffd05ffc3e
Removing methods from Dispatcher that have been moved to CakeRequest.
...
Removing test cases for features that don't exist anymore.
Updating Router and Dispatcher to use the request object.
2010-05-01 01:43:06 -04:00
Mark Story
c03974ebb2
Expanding documentation for Router::queryString().
2010-04-24 00:21:17 -04:00
Mark Story
35c8f9963a
Adding @throws to methods that could throw exceptions.
2010-04-23 22:29:57 -04:00
Mark Story
797fa0009a
Making Router throw exceptions when invalid route classes are used for routes.
2010-04-23 20:22:02 -04:00
Mark Story
120fdd9045
Removing other uses of Routing.admin as it has been removed from Router.
2010-04-20 23:43:51 -04:00
Mark Story
a71a8a89b2
Removing support for Routing.admin. Use Routing.prefixes instead.
2010-04-20 23:40:13 -04:00
Mark Story
661c76802c
Making singleton access use a class property.
2010-04-19 23:56:36 -04:00
Mark Story
e92e212b8d
Fixing Router's constructor.
...
Adding static visibility to Router methods.
Adding a method for testing Router extensions.
Router::mapResources() now returns the mapped resources
Fixing visibility issues in test cases.
2010-04-19 23:44:45 -04:00
predominant
92215e1795
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/libs/inflector.php
cake/libs/view/helpers/text.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/view/helpers/time.test.php
2010-04-16 23:43:28 +10:00
predominant
c98021dcd8
Converted views, router and security classes to new translation shotcut function use.
2010-04-16 02:20:15 +10:00
Mark Story
79eeb33e35
Fixing constructors
...
Adding method visibility.
Removing reference operators.
2010-04-14 22:56:51 -04:00
Mark Story
404401b4de
Moving action modification when a prefix is detected so it affects all url arrays. Previously it was only applied to parameters in the current request. This fixes inconsistencies between request parameters and url parameters. Fixes #570
2010-04-11 23:13:18 -04:00
Mark Story
e1253f0bb5
Including a plugin short route for prefixes as well. There were failing Dispatcher tests relying on this.
2010-04-10 21:12:48 -04:00
Mark Story
fbaabad6bb
Fixing issues where route parameters that overlapped could cause route compilation errors. Tests added. Fixes #565
2010-04-10 11:17:24 -04:00
predominant
60bb9a9b56
Spacing doc blocks.
2010-04-09 22:06:44 +10:00
predominant
52cdef900b
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/dispatcher.php
cake/libs/model/behaviors/acl.php
cake/libs/model/behaviors/containable.php
cake/libs/model/behaviors/tree.php
cake/libs/router.php
cake/tests/cases/libs/validation.test.php
2010-04-09 22:05:00 +10:00
Mark Story
81dc0d42b9
Adding PluginShortRoute into default connected routes. Fixes issues with the framework having built in 404s.
...
Adding tests for the default connected routes.
2010-04-08 00:03:46 -04:00
