Commit graph

308 commits

Author SHA1 Message Date
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
mark_story
8209a298f7 Make CakeRoute::persistParams() more tolerant
Subclasses and instances may not always define persist options.
CakeRoute should be accepting of these differences.

Fixes #3957
2013-08-02 13:28:58 -04:00
ADmad
61bf8df454 Renaming base url config keys and methods for better uniformity. 2013-08-01 00:44:36 +05:30
mark_story
e03d3df0fe Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Test/Case/View/HelperTest.php
	lib/Cake/VERSION.txt
2013-07-17 22:40:09 -04:00
mark_story
d4db64ff26 Ignore asset requests containing %2e in them.
urldecode URI's early to avoid issues with encoded `.` characters.
2013-07-16 13:14:27 -04:00
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
ADmad
12da3b1f27 Merge branch 'master' into 2.4 2013-06-16 13:07:44 +05:30
Mark Story
e454f2d2a3 Merge pull request #1334 from thegallagher/2.3-cache-fix
Fix content-type header in cached views.

Fixes #2358
2013-06-12 18:27:42 -07: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
David Gallagher
0eead76d4b Fix content-type header in cached views. Fixes issue #2358 2013-06-06 23:33:51 +10: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
f8c6138ad7 Fix incorrect exception type when double slash paths are used.
Fixes #3838
2013-05-18 12:20:06 -04:00
euromark
fab5a6f4d9 spelling corrections 2013-04-30 14:11:50 +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
Adam Taylor
433dd09ec4 Fix typos 2013-03-05 00:05:14 -07: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
ADmad
484801ecf4 Prevent response object being set as response body 2013-02-16 02:07:02 +05:30
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
euromark
11a88042bd fix doc block endings 2013-01-11 15:06:54 +01: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
8febb71b67 Merge pull request #1003 from dereuromark/2.3-cache-prefixes
cache prefix for view cache to avoid collisions with domains/languages
2012-12-17 00:46:08 -08: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
euromark
32f2426001 cache prefix for view cache to avoid collisions with domains/languages 2012-12-11 12:54:16 +01: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
euromark
881127ef4d unify new lines at the end of the file 2012-12-05 15:00:24 +01:00
Saleh Souzanchi
d5283af818 fixed utf-8 pattern in router option 2012-12-02 16:30:45 +03:30
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
5741ac1828 add type hinting to dispatch filters 2012-11-22 10:02:36 +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
mark_story
feda6e06a0 Reduce some code complexity. 2012-10-03 22:59:35 -04: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
Ceeram
e4542827c8 avoid pass by reference error on 5.4 2012-09-24 18:26:25 +02:00
Ceeram
3665a95996 refactoring asset dispatcher filter 2012-09-24 10:06:45 +02:00
dogmatic69
b1f26b59a3 converting if ($foo != null) to if ($foo) 2012-09-21 23:30:43 +01:00
dogmatic69
aa87791432 replacing is_integer() with is_int() 2012-09-15 11:15:01 +01:00
dogmatic69
cfadc4dbb0 strict type checks and removing some duplicate count() calls by setting a variable 2012-09-14 19:26:00 +01:00
dogmatic69
5cc03ca805 converting if($foo == true) to if($foo) 2012-09-14 18:54:29 +01:00
dogmatic69
22a2e1b51e converting $foo == / $foo == 0 to !$foo (and a few $foo === 0) 2012-09-14 18:42:25 +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
mark_story
e59555a66f Merge branch 'master' into 2.3 2012-08-03 22:45:56 -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
Ceeram
2a0a5f2afa Use the returned response instance from the event 2012-07-31 18:39:05 +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
Ilie Pandia
73d44c5f6b Fixed some typos in the comments in this file. This helps with type
hinting in IDEs that support that.
2012-07-08 07:33:14 +03:00
mark_story
31033239bd Add missing urlencoding to nested named parameters.
Fixes #2988
2012-07-02 23:34:53 -04: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
Rachman Chavik
335f3558a9 fixing null request returned by Router::getRequest()
fixes issues for Router::getRequest() called in a Plugin/Foo/routes.php
during bootstrap.
2012-05-11 22:16:17 +07: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
mark_story
7240286adc Fix coding standards errors. 2012-04-23 22:01:45 -04:00
Ceeram
74ee75b0ef Merge branch '2.1' into 2.2 2012-04-23 10:34:04 +02:00
Jose Lorenzo Rodriguez
53a4de7774 More coding standard fixes 2012-04-22 20:34:19 -04:30
Jose Lorenzo Rodriguez
4b2804bb42 Fixing broken test and coding standard 2012-04-22 17:39:45 -04:30
Tigran Gabrielyan
49eac06d89 Fixed bug in Router::normalize() 2012-04-21 18:37:58 -07:00
Jose Lorenzo Rodriguez
fd8971ba06 Adding smart header checking to return 304 response in AssetDispatcher filter 2012-04-19 00:00:32 -04:30
Jose Lorenzo Rodriguez
826699a670 Extracting asset dispatcher and cache dispatcher into separate classes to provide examples on how to use Dispatcher
Filters
2012-04-17 00:42:18 -04:30
Jose Lorenzo Rodriguez
70f3cc579c Renaming a few things in dispatcher filters to maccht general naming style in CakePHP 2012-04-16 23:41:32 -04:30
Jose Lorenzo Rodriguez
565a58f784 Introducing dispatcher filters and adding tests for them 2012-04-16 00:36:08 -04:30
Jose Lorenzo Rodriguez
cfaa1ee37c Adding missing docblocks 2012-04-15 11:47:41 -04:30
Jose Lorenzo Rodriguez
d17a471451 Initial middelware implementation 2012-04-15 11:39:08 -04:30
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
Saleh Souzanchi
e741d79f9a urldecode trailing pass 2012-03-07 06:06:59 +03:30
mark_story
4640b8ea23 Fix coding standar errors in Routing/ 2012-03-03 20:28:22 -05:00
Jose Lorenzo Rodriguez
6918b70ec3 REmoving usage of deprecated ThemeView 2012-02-20 16:49:16 -04:30
mark_story
20229eeb43 Merge branch '2.0' into 2.1 2012-02-18 11:22:18 -05:00
teddy
e6905b44c3 urldecode custom route element values 2012-02-18 10:59:46 -05: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
Ceeram
c8eae93292 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Network/Http/HttpSocket.php
2012-02-01 12:11:01 +01:00
Anton
57eec6e6fc added decoding of keys for named parameters 2012-01-30 00:26:56 +02: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
Jose Lorenzo Rodriguez
c53f0e6877 Explicitly casting to string a variable that could in times be either string or integer 2012-01-11 21:25:22 -04:30
Mark Story
81d7ef46c5 Merge pull request #392 from vesln/resource-map
Resource map
2012-01-02 05:23:30 -08:00
Veselin Todorov
8864805277 Adding resourceMap accessor 2012-01-02 13:53:21 +02:00
ADmad
389072708a Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
euromark
a41539dfa4 Indentation fix (tab instead of spaces)
Fixes #2398

Conflicts:

	lib/Cake/Test/Case/Console/Command/ShellTest.php

Signed-off-by: mark_story <mark@mark-story.com>
2011-12-20 22:26:43 -05:00
mark_story
e05d7d1791 Make dispatcher::cached() use here()
This allows separate cache files to be created
for different query parameters.

Fixes #2381
2011-12-17 12:19:34 -05:00
mark_story
2e8498e166 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
Kyle Robinson Young
c836ba08a3 Add/move docblocks to make text available in the API docs 2011-12-08 07:35:02 -08:00
Kyle Robinson Young
3974ea87d8 Move Route docblocks to make text available in the API 2011-12-07 00:03:11 -08:00
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
mark_story
6d269ce25d Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
Kyle Robinson Young
8197f87dbc Spelling and grammar fixes 2011-12-01 21:58:09 -08:00
mark_story
8b3c72f7c1 Fix issue with nested named parameters.
Nested named parameters were not being correctly flattened.

Fixes #2329
2011-12-01 20:32:28 -05:00
mark_story
79d6a850ad Fix theme files with spaces in them.
Fixes #2324
2011-12-01 18:16:01 -05:00
Kyle Robinson Young
5876744709 Adhering to coding standards 2011-11-30 07:44:11 -08:00
mark_story
21cd3f00ac Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/BasicsTest.php
2011-11-19 20:40:07 -05:00
mark_story
cb49b242ae Fix issue in Router with prefixes.
Prefixes should not be interpreted as named parameters.
Fixes #2269
2011-11-17 20:30:34 -05:00
mark_story
254357e9c9 Merge branch '2.0' into 2.1 2011-11-11 22:38:11 -05:00
Ceeram
7224de962e removing unused variable, fixes #2227 2011-11-07 09:19:01 +01:00
mark_story
0304bb8796 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
2011-11-03 22:04:00 -04:00
mark_story
92f9a6c1db Fix missing urlencod/urldecode in routing.
Named params and passed args should be urlencoded, as they
may contain non-ascii characters.

Refs GH-214
2011-10-29 20:42:07 -04:00
Jose Lorenzo Rodriguez
66cf86c154 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-28 23:46:13 -04:30
Jose Lorenzo Rodriguez
60e3f02eac Setting a correct Content-Length for plugin assets 2011-10-28 23:45:31 -04:30
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -04:00
mark_story
ad524b25ef Merge branch '2.0' into 2.1 2011-10-25 22:29:03 -04:00
mark_story
477c492e86 Fix issue where named parameters would not be urldecoded.
Fixes #2155
2011-10-25 21:07:27 -04:00
mark_story
c3f647217d Implement trailing greedy star star.
Trailing args grabs all trailing arguments as a single passed
parameter.  This is useful when you want to have trailing arguments
that contain / in them.
2011-10-23 21:27:28 -04:00
mark_story
6d6aa3cb75 Add _stop() to RedirectRoute.
Moved from CakeResponse to RedirectRoute,
as RedirectRoute is the only place its currently needed.

Refs #2143
2011-10-22 22:56:50 -04:00
mark_story
32b48ecc7c Fix issue with missing base on redirect route.
The request data wasn't set in Router when redirect routes are processed.
This caused the base to become missing. This causes issues with applications
running in a subdirectory.
2011-10-22 18:48:31 -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
Renan Gonçalves
e37703efdd Fixed typo from last commit. 2011-10-16 13:42:50 +02:00
Renan Gonçalves
573a349209 Using plugin name on exception thrown and in templates files. 2011-10-16 13:40:36 +02:00
mark_story
4810518c7d Fix issue where abstract or interface controllers
would be constructed by Dispatcher.
Tests added.
Fixes #2048
2011-09-30 22:40:30 -04:00
mark_story
0e5797d69d Make full page caching + Themes work.
Dispatcher now uses ThemeView for rendering cache files.
This enables nocache blocks to reference theme elements.
Fixes #1858
2011-09-17 13:19:43 -04:00