euromark
a5531f7419
fix casing
2013-08-03 04:32:39 +02:00
mark_story
19ac39963a
Remove duplicate code.
...
The conditions for persistParams() work should be self contained. Remove
this duplication.
2013-08-02 13:30:31 -04:00
ADmad
61bf8df454
Renaming base url config keys and methods for better uniformity.
2013-08-01 00:44:36 +05:30
mark_story
e016f1156f
Revert previous changes.
...
Adding this parameter was a mistake. Remove it.
2013-07-12 21:37:22 -04:00
mark_story
52be365598
Introduce the strip
argument to Router.
...
This allows callers to request that the basepath *not* be stripped off
when normalizing string URL's. This is important in AuthComponent when
handling redirect URL's as the redirect location could point to
a controller that shares a name with the base path.
Refs #3897
Refs #3916
2013-07-12 21:16:18 -04:00
Harold Putman
1ff77f2363
Fix subtle error in Regex matching URI scheme.
...
[+-.] will match plus, hyphen, and dot, but also comma. Use [+\-.] since commas not allowed in URI scheme.
2013-06-21 15:17:59 -04:00
Harold Putman
2fd36bdedc
Router::url should passthru //example.com/file.ext
...
The function allows ://example.com/file.ext but was treating //example.com as cake-relative URL. The updated regex matches URI schemes as defined in RFC2396. Will passthru any of these formats:
* Starts with a valid URI scheme (javascript:, https:, itunes:, ftp:)
* Starts with a '#'
* [NEW] Starts with a '?' which may be meaningless, but is as valid as starting with '#' (RFC1808)
* starts with //, or :// (:// is not technically valid, but included for compatibilty)
2013-06-21 15:10:11 -04:00
mark_story
cd3c54bb9d
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-06-10 22:12:10 -04:00
euromark
42777b7809
incorrect tab to space - whitespace coding standards
2013-06-09 21:01:01 +02:00
José Lorenzo Rodríguez
3b4a4fde31
Merge pull request #1317 from lorenzo/feature/full-base-url
...
Adding App.fullbaseURL as a recognized Configure value
2013-06-05 15:12:27 -07:00
Jose Lorenzo Rodriguez
10ba4dd773
Fixed CS errors
2013-06-06 00:11:50 +02:00
Jose Lorenzo Rodriguez
7b746ccb57
Overwriting App.fullBaseURL if changed using Router::baseURL()
2013-06-05 23:57:16 +02:00
Marc Würth
4c9f0414cb
Improved the DocBlocks and other code cleanup
...
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Jose Lorenzo Rodriguez
4bc92b822e
Adding App.fullbaseURL as a recognized Configure value
2013-05-30 16:07:26 +02:00
Mark Story
ac94d11e65
Merge pull request #1254 from dereuromark/master-spelling-corrections
...
spelling corrections (a url to an URL, unify URL)
2013-04-29 09:27:48 -07:00
euromark
09d9efe235
spelling corrections (a url to an URL, unify URL)
2013-04-29 11:05:17 +02:00
Saleh Souzanchi
a48149b4db
update doc of Router::redirect
2013-04-29 06:06:22 +04:30
Saleh Souzanchi
720dc5e8c0
fix currentRoute() when $_currentRoute is empty, return false
2013-04-26 09:09:40 +04:30
mark_story
63b392a26b
Improve error message.
...
One of the cases was not explained in the existing error message.
Fixes #3773
2013-04-19 12:13:58 -04:00
mark_story
8eb56960d8
Remove remaining reference operators.
...
These were left over from the days of 1.x and aren't needed anymore.
2013-04-15 21:23:48 -04:00
Juan Basso
ce5563ff83
Supoprt query parameters on Router::parse. It will increase the symmetry of parse and reverse methods
2013-04-12 23:28:23 +00:00
mark_story
d9fbe5e00a
Tidy up doc blocks.
...
These kind of changes make tidyier method summaries in apigen.
2013-02-26 21:43:53 -05:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01:00
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
Ceeram
3f4d24bfc0
remove unused local variables and a few improvements
2012-12-23 13:53:13 +01:00
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
mark_story
6f5ff4d7dd
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
2012-12-13 20:20:42 -05:00
mark_story
6292fc707d
Fix example & incorrect import.
2012-12-09 14:06:28 -05:00
mark_story
9c9cc7fba2
Expand doc block for Router::connect().
2012-12-09 13:57:50 -05:00
ADmad
72d6ca636f
Docblock fixes
2012-11-29 04:36:29 +05:30
Schlaefer
94a17d40da
fix ticket 3400: url string with # in it is not routed
...
See: http://cakephp.lighthouseapp.com/projects/42648/tickets/3400-url-string-with-in-it-is-not-routed
2012-11-26 16:43:47 +01:00
Ceeram
eadc3a75e5
fix coding standards
2012-11-21 15:39:03 +01:00
dogmatic69
641ba9f3e6
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
2012-10-24 19:03:44 +01:00
mark_story
1aea9ac0c9
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Event/CakeEventManager.php
lib/Cake/VERSION.txt
lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04:00
euromark
0197700e4f
simplify check
2012-10-09 12:24:10 +02:00
euromark
2cff67184f
avoid offset -1 error on tests etc
2012-10-09 11:49:44 +02:00
AD7six
fa6defea37
url encode nested named parameters in unmatched routes
...
reference: #2988
and 31033239bd
2012-10-05 11:40:58 +02:00
AD7six
5140baf83d
Load routes as late as possible.
...
As a concequence - routes will also work by default in the cli
2012-10-04 21:41:12 +02:00
dogmatic69
408e619c9f
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
Jose Lorenzo Rodriguez
d5c9d97dc1
Merge remote-tracking branch 'origin/master' into 2.3
...
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
dogmatic69
b1f26b59a3
converting if ($foo != null) to if ($foo)
2012-09-21 23:30:43 +01:00
dogmatic69
5cc03ca805
converting if($foo == true) to if($foo)
2012-09-14 18:54:29 +01:00
Rachman Chavik
0cae19a14e
enable PluginDot for routeClass parameter
2012-09-12 21:24:56 +07:00
mark_story
a934f700f1
Fix parsing '0' as a url.
...
Fixes #3198
2012-09-09 20:56:40 -04:00
euromark
57bf15a415
multiple strpos to preg_match
2012-08-01 20:42:27 +02:00
euromark
b6fe8af701
adding sms as protocol
2012-08-01 12:38:06 +02:00
euromark
b73be3139f
allowing tel protocol for mobile devices
2012-08-01 12:02:50 +02:00
Tigran Gabrielyan
851aa8bef4
Fixed issue in _validateRouteClass where setting defaultRouteClass back to CakeRoute would throw an exception
2012-07-25 14:13:25 -07:00
Ceeram
acbb2bebc9
adding setExtensions() to allow adding more extensions as parseExtensions would override existing valid extensions
2012-05-30 21:29:05 +02:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
Jelle Henkens
484c3ec688
Adding support for a trailing & or & in the existing queryString
2012-05-10 20:55:46 -04:30
Jelle Henkens
e53074dab9
Fixing order inconsistency in queryString and bug with string based existing querystring
2012-05-10 20:55:46 -04:30
mark_story
46bce1a00f
Merge branch '2.1' into 2.2
2012-04-26 22:27:44 -04:00
mark_story
6bb8b22cdb
Fix space indented code.
2012-04-26 22:27:34 -04:00
mark_story
eefb2e81fa
Fix issue where prefixes mid action would be truncated.
...
If a prefix occured mid action name it would be removed,
corrupting the action name.
Fixes #2831
2012-04-24 20:48:23 -04:00
Ceeram
74ee75b0ef
Merge branch '2.1' into 2.2
2012-04-23 10:34:04 +02:00
Tigran Gabrielyan
49eac06d89
Fixed bug in Router::normalize()
2012-04-21 18:37:58 -07:00
mark_story
9f9feec222
Merge branch '2.2-hash' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
mark_story
fe1a6d7d7e
Fragments should not be urlencoded()
...
encoding them breaks fragments for client side
applications like backbone.js
Fixes #2755
2012-04-06 21:32:37 -04:00
ADmad
863094da58
Fixing eg. code in doc block
2012-04-07 00:28:59 +05:30
mark_story
8497677e97
Fix notice error when there are no requests.
2012-04-04 21:32:51 -04:00
mark_story
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
mark_story
76711c9f71
Add missing rawurlencode()
...
When routes fail to match because of unknown named parameters,
values that needed urlencoding were missing it.
Fixes #2572
2012-02-13 21:16:57 -05:00
mark_story
2afb05b590
Merge branch '2.0' into 2.1
...
Conflicts:
app/View/Pages/home.ctp
lib/Cake/Config/config.php
lib/Cake/Core/App.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
mark_story
ab09229d40
Update API docs
...
View switching only happens for known mime types.
Refs #2565
2012-02-11 11:45:06 -05:00
mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
mark_story
c81fe6249d
Fix prefix = false in connect()
...
Connecting routes with a prefix = false created an un-matchable route.
Ignore falsey prefix values when setting up prefixes.
Fixes #2479
2012-01-16 21:30:26 -05:00
Tigran Gabrielyan
f5b62eb84c
Fixed typo in DocBlock
...
Router::defaultRouteClass will return the current routeClass if null is
passed
Router::connect and Router::defaultRouteClass both validate the routeClass
now using Router::_validateRouteClass
2012-01-14 18:45:51 -08:00
mark_story
b14072aa6f
Add Router::defaultRouteClass()
...
Apply patch from 'Tigran Gabrielyan'.
Allows you to set the default route class used for all future
routes.
Fixes #2435
2012-01-12 22:19:55 -05:00
Veselin Todorov
8864805277
Adding resourceMap accessor
2012-01-02 13:53:21 +02:00
Ceeram
7224de962e
removing unused variable, fixes #2227
2011-11-07 09:19:01 +01:00
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
Rachman Chavik
2bb93761cc
fixing typos
2011-10-19 12:19:28 +07:00
mark_story
55064b6573
Applying fix from 'euromark' to fix protocol relative links
...
Fixes #2107
2011-10-17 21:03:25 -04:00
Mark Story mark@mark-story.com
41b22c5521
Fixing Router::mapResources() so it works with plugins.
...
Fixes #1956
2011-09-01 18:49:01 +01:00
Juan Basso
7d0250ff47
Merge branch '2.0-api-doc' into 2.0
2011-08-26 20:22:26 -04:00
mark_story
6acf024a2b
Fixing incorrect keying for ext routing parameter. It was
...
nested under params[url][ext]. This makes it unlike
all other routing parameters. Having the nested value
also makes reversing requests harder, and generating urls more
difficult.
Adding a test for Router::reverse() and extensions.
Fixes #1923 , fixes #1928
2011-08-22 22:26:02 -04:00
Juan Basso
f5a54d00dd
Changed methods and attributes from private to protected.
2011-08-20 00:43:34 -04:00
Juan Basso
16ef234180
Removing trailing spaces.
2011-08-15 23:55:08 -04:00
Juan Basso
620a65b2fc
Merge branch '2.0' into 2.0-api-doc
...
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
mark_story
fdacc9de16
Fixing issues with request stack not being used correctly
...
when there are requestAction requests being performed.
Adding Router::popRequest() to allow manipulation of request stack
so nested requestAction or serial requestAction calls work correctly.
Fixes #1906
2011-08-12 21:21:05 -04:00
Juan Basso
895c10af7b
Adjusted some types in @param, @return and @var.
2011-07-31 22:57:17 -04:00
Juan Basso
2a50a1ea99
Included @var in API that was missing.
2011-07-31 17:05:20 -04:00
Juan Basso
9bc3e567c1
Removed the @access and @static.
2011-07-30 20:56:48 -04:00
Juan Basso
e74d835a62
Fixed some API doc in routing and cache.
2011-07-30 17:02:25 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
mark_story
16073b4e44
Fixing notice errors in Router.
...
Updating AuthComponent tests for changes in Router behavior.
2011-07-22 20:29:45 -04:00
mark_story
cfb3e8a15b
Moving default routes into a separate file.
...
Removing Router::defaults() as its not needed anymore.
Removing default routes from inside router.
Removing properties related to default routes.
Removing dead tests and updating tests.
2011-07-22 20:29:45 -04:00
Robert Sworder
fb3a1928d3
Minor comment and path changes.
2011-06-25 15:08:41 +01:00
Juan Basso
192812ee7f
Updating the copyright to 2011.
2011-05-30 22:32:43 -04:00
Jose Lorenzo Rodriguez
5b8865a3a7
Making plugin routes load after app routes, closes #1722
2011-05-22 21:50:56 -04:30
mark_story
6289f20b83
Fixing Router::reverse() serializing all of _Token.
...
Removing CSRF tokens from the parameters SecurityComponent exports.
Updating tests for both Router and SecurityComponent.
Fixes #1697
2011-05-16 20:35:27 -04:00
Jose Lorenzo Rodriguez
91bce16e9d
Merge remote-tracking branch 'origin/2.0' into 2.0-merge
...
Conflicts:
lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
lib/Cake/Test/Case/Log/Engine/FileLog.php
lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticateTest.php
lib/Cake/tests/Case/Log/Engine/FileLog.php
lib/Cake/tests/Case/Log/Engine/FileLogTest.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/PluggedHelper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/TestPluginAppHelper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
2011-05-15 00:40:54 -04:30
Joey Trapp
3675e73c73
Added a flag to Router::reverse that is passed on to the Router::url call
...
Fixes #1638
Signed-off-by: mark_story <mark@mark-story.com>
2011-05-10 21:07:56 -04:00
Jose Lorenzo Rodriguez
ca99b5b515
Fixing Router and Dispatcher so they user the plugin loader
2011-05-09 00:01:00 -04:30
mark_story
695d38fe68
Removing stupid default that stops other convention based features from working properly.
2011-05-04 22:16:46 -04:00
evilbloodydemon
3c9cb3b97d
Unused variables in Routing removed
2011-04-23 00:02:09 +04:00