Commit graph

123 commits

Author SHA1 Message Date
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
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01: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
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
euromark
11a88042bd fix doc block endings 2013-01-11 15:06:54 +01:00
Majna
6d75d90c25 Code cleanup
Remove unneeded sprintf.
Fix doc blocks.
Remove duplicated keys in tests assertions.
Use boolean value for CakeRequest $parseEnvironment param.
2012-12-28 23:37:58 +01:00
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
mark_story
27d7e2865e Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Network/CakeSocket.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/MediaView.php
	lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
Ceeram
e02eab05d5 Remove all todo from core, create tickets for them 2012-11-14 14:59:51 +01:00
mark_story
c24bec679b Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/View/Helper/FormHelper.php
2012-10-27 21:13:53 -04:00
Ber Clausen
a7d9422c09 Test all empty array with assertSame() because assertEquals() does not check the type. 2012-10-26 19:21:51 -03: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
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
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
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
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
c2920aa3bf Fixing small variable typo 2012-05-12 18:43:39 +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
Jose Lorenzo Rodriguez
bf0f5ab118 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
mark_story
46bce1a00f Merge branch '2.1' into 2.2 2012-04-26 22:27:44 -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
euromark
bc2cd00123 cake 2.2 test case fixes (assert corrections, correct class names) 2012-04-21 15:02:35 +02:00
Renan Gonçalves
b0b36e8fba Defining default values for CakeRequest, those params are present anywhere except when there isn't a Route match. 2012-04-13 15:58:45 +02: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
Kyle Robinson Young
90e7afbdc7 Correct parameter order of assertEquals and assertNotEquals 2012-03-22 23:37:12 -07:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
907596b2f5 Fix coding standards in Case/Routing 2012-03-12 21:36:27 -04:00
Kyle Robinson Young
4176e59e52 Typo fixes in tests 2012-02-23 15:29:53 -08:00
Kyle Robinson Young
22582aee63 Upgrade legacy uses of App::build() types 2012-02-18 04:31:29 -08:00
Kyle Robinson Young
c4829dc3b8 Use App::RESET instead of true with App::build() 2012-02-18 04:04:54 -08:00
Kyle Robinson Young
4141a3ab5b Load specific test plugins rather than all to avoid conflicts 2012-02-16 20:03:44 -08:00
Majna
d41e5621b7 Fix missing and invalid assertions in tests.
Remove unused variables and dead code.
2012-02-16 19:28:21 +01: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
Jose Lorenzo Rodriguez
a1daaf5960 Merge branch '2.1-http' into 2.1 2012-01-21 15:51:34 -04:30
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
Jose Lorenzo Rodriguez
769a5c24e6 Fixing some failing test cases 2012-01-19 01:08:45 -04:30
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
3eea2e2073 Adding resourceMap accessor test 2012-01-02 13:53:32 +02:00
Kyle Robinson Young
b46c4b3e3f Correcting assertEquals parameter order 2011-12-12 20:35:31 -08:00
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
Kyle Robinson Young
94e119fe67 Adhere to code formatting standard 2011-11-30 23:21:31 -08:00
Kyle Robinson Young
98f03dc6df Replacing test case compatibility functions 2011-11-16 21:07:08 -05:00
mark_story
bfd95d0e04 Fixing remaining failing tests in PHPUnit 3.6 2011-11-04 22:54:09 -04:00
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -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
8e69df9013 Revert "Fix RedirectRoute by stopping execution."
This reverts commit 841e7aa560.

Having _stop() on CakeResponse seemed like the wrong place to stop
execution.  It can make testing with redirects harder.
Instead RedirectRoute should be stopping execution.
2011-10-22 22:44:21 -04:00
Majna
841e7aa560 Fix RedirectRoute by stopping execution.
If CakeResponse sends a Location header, it will stop execution.
This fixes issues with where a body would be sent with redirect headers.
Tests updated.

Fixes #2143
2011-10-22 13:22:28 -04:00
mark_story
55064b6573 Applying fix from 'euromark' to fix protocol relative links
Fixes #2107
2011-10-17 21:03:25 -04:00
Majna
8d6fc84135 Fixing failing test for Router. Debugger test fails on windows due to different directory separator. 2011-09-27 23:47:44 +02: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
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
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
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
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Renan Gonçalves
438050dcaa Adding 'public' visibility to all public methods. 2011-05-30 22:02:32 +02:00
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
AD7six
0a53242e3e correcting all the inverted assertEqual tests
$expected is the first argument. Now certain test results start to make
sense:

	1) MultibyteTest::testUsingMbStrtolower
	Failed asserting that two strings are equal.
	--- Expected
	+++ Actual
	@@ @@
	-ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀჁჂჃჄჅ
	+ⴀⴁⴂⴃⴄⴅⴆⴇⴈⴉⴊⴋⴌⴍⴎⴏⴐⴑⴒⴓⴔⴕⴖⴗⴘⴙⴚⴛⴜⴝⴞⴟⴠⴡⴢⴣⴤⴥ
2011-05-17 00:49:00 +02:00
AD7six
afa8f6b441 remove LIBS constant
libs always means the Cake lib - so use the CAKE constant
2011-05-15 18:29:52 +02: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
Jose Lorenzo Rodriguez
7ba60ff424 Changing more paths 2011-05-13 03:15:04 -04:30
Jose Lorenzo Rodriguez
900dfef2f7 Starting unification of casing in remaining folders 2011-05-13 01:53:49 -04:30
Renamed from lib/Cake/tests/Case/Routing/RouterTest.php (Browse further)