Commit graph

3942 commits

Author SHA1 Message Date
mark_story
21dd7fd4ca Fixing connection of plugin routes, the were being connected in the wrong spot.
Moving admin route + plugin tests to correct place.
Fixing order of methods in tests. parse() should only be called after routes are connected otherwise the default routes will precede the custom routes.
2009-12-01 14:39:23 -05:00
mark_story
a8f79f9fe5 Removing defaults that are also keys this makes the actions with the default index key work much better. Also things can't be both a variable and a constant routing parameter. 2009-12-01 13:37:03 -05:00
mark_story
393038816c More tests passing in RouterTest now. 2009-11-30 10:15:39 -05:00
mark_story
11dd7898c4 Fixing tests + adding tests for passed args order preservation when passed args are part of default route parameters. 2009-11-30 00:23:41 -05:00
mark_story
e41c408378 Adding parameter pattern matching back into RouterRoute::match(), fixes failing tests in RouterRoute test case. 2009-11-29 23:46:02 -05:00
mark_story
5999264f10 Most of RouterRoute::match() working now. Failing tests for params with patterns included. 2009-11-29 22:57:10 -05:00
mark_story
de0b90db4a Moving addition of plugin and controller keys to Router instead of RouterRoute. 2009-11-29 16:21:33 -05:00
mark_story
9e9559b350 Working on RouterRoute::match(). Adding tests for RouterRoute::match() and removing defaults from routes that don't need defaults. 2009-11-29 16:09:45 -05:00
mark_story
0834cb47ab Removing code from RouterRoute::__mapRoute. All tests passing. 2009-11-29 12:10:09 -05:00
mark_story
b242dc9531 Moving parameter persist to RouterRoute.
Tests updated.
2009-11-29 10:59:38 -05:00
mark_story
f59b8daf2e Expanding tests for passed arguments in route defaults working correctly. Refactoring passed arguments in route default handling. 2009-11-29 09:49:19 -05:00
mark_story
889e367510 Expanding and correcting doc block for router::connect. 2009-11-28 23:37:40 -05:00
mark_story
7216925394 Updating doc blocks. 2009-11-28 23:12:44 -05:00
mark_story
a86e414adc Removing Router::stripEscape() and all uses of it.
Router::stripEscape() removed escape patterns supported in DboSource.  Since those escape patterns no longer exist, neither does the need for the escaping of those patterns.
2009-11-28 23:08:52 -05:00
mark_story
d70689ecda Merge branch '1.3-misc' into write-route 2009-11-28 23:04:22 -05:00
mark_story
02f9275e20 Removing automagic -! sql no-escape string handling. Removing use of Router::stripEscape() from Dispatcher, as this method removed -! from url + post data. 2009-11-28 23:02:59 -05:00
mark_story
5cbe3dbd39 Removing unused variables. Making loop easier to read. 2009-11-28 21:58:02 -05:00
mark_story
5b4d15dc3b Removing support for mid route * elements. Mid-route lazy * behaved in a sometimes erratic fashion making routes employing mid-route lazy * hard to depend on. 2009-11-28 21:54:33 -05:00
mark_story
33c67f7c47 More tests passing and more code moved from Router to RouterRoute. Switching RouterRoute to used named capture groups. This simplifies the route processing internals as there are fewer loops used to merge array sets together. 2009-11-28 09:40:15 -05:00
mark_story
4cb055ff0a Removing tests for features no longer supported. Path elements containing only regular expressions are no longer supported. They did not effectively reverse route. And they provided an inconsistent behavior when combined with the full gamut of regular expressions and routing parameters. 2009-11-27 17:12:35 -05:00
mark_story
49c6cd3f9f Fixing issues with optional parameters. Allows route params to be made optional by setting a pattern definition. 2009-11-27 09:58:51 -05:00
mark_story
fd98bc5d76 Expanding tests on Router and RouterRoute. 2009-11-26 23:46:42 -05:00
mark_story
89d0ed8f3b Route compilation tests passing again. 2009-11-26 21:42:33 -05:00
mark_story
8315b48e77 Removing String::getInstance() as it was causing fatal errors when eAccelerator was enabled, and is a deprecated method. 2009-11-26 18:24:14 -05:00
mark_story
c4ceeabcf5 More tests and more passing tests for Route compilation.
Basic route compiling complete.
2009-11-26 09:41:05 -05:00
mark_story
6661c2fa70 Starting to refactor RouterRoute::_writeRoute 2009-11-26 00:17:43 -05:00
mark_story
3885466e9a Changing $_this to the easier to type $self. 2009-11-25 23:40:52 -05:00
mark_story
1d7881b16f Renaming connectDefaults to defaults().
Updating tests.
2009-11-25 23:39:07 -05:00
mark_story
636d944e70 Adding Router::connectDefaults(). Allows the developer to disable Router's automatic generation of routes. 2009-11-25 23:21:10 -05:00
mark_story
52264cb61c Fixing persistent param route exiting.
Adding test for exiting persist param routes.
2009-11-25 23:12:48 -05:00
mark_story
35fac165b3 Merge branch '1.3-misc' into 1.3-router
Conflicts:
	cake/libs/router.php
2009-11-25 22:57:42 -05:00
mark_story
e345b2f788 Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-25 22:23:38 -05:00
phpnut
d685c18720 Adding checks for directory traversal attempts related to recent changes allowing plugins and themes to include their own webroot/* assets 2009-11-25 12:41:19 -06:00
phpnut
0977029c89 Removing limit of image, js and css in plugins 2009-11-25 09:47:23 -06:00
phpnut
c942fa7038 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-25 08:40:14 -06:00
phpnut
2254bfe5c9 Adding ability for plugins to have there own webroot.
plugins/<PLUGINNAME>/webroot/*

Themes can also be self contained with a webroot directory.
app/views/themed/<THEMENAME>/webroot/*

vendors directory for assets is deprecated and no longer supported
2009-11-25 01:51:25 -06:00
mark_story
3b1256cefb Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-24 22:10:11 -05:00
mark_story
69b72083be Adding docblock and removing a call to array_slice() 2009-11-24 22:06:55 -05:00
dogmatic
53bfc8cca2 a new take on toList and more tests for passing a different separator 2009-11-24 22:00:33 -05:00
dogmatic
398113f828 fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:27:56 -05:00
mark_story
8cdee90b4f Merge branch '1.3-misc' into 1.3-merger
Conflicts:
	cake/libs/view/helpers/html.php
2009-11-22 21:28:14 -05:00
mark_story
6fdaa82969 Merge branch '1.3' into 1.3-merger 2009-11-22 21:26:39 -05:00
mark_story
f28b3c6efd Fixing failing tests on ModelIntegrationTest related to with keys with bound fields set not retaining the fields set. 2009-11-22 21:26:25 -05:00
mark_story
4d37e75f18 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/controller/components/cookie.php
	cake/libs/debugger.php
	cake/libs/flay.php
	cake/libs/http_socket.php
	cake/libs/inflector.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
mark_story
2e0acbf505 Making habtm join conditions used by __saveMulti when finding link records to remove. It should be noted that having conditions on non-joinTable tables, and not having a model on the joinTable can cause SQL issues. Fixes #304 2009-11-22 17:56:46 -05:00
AD7six
4f3852618f correcting $this -> $self
removing debug code
2009-11-22 19:58:10 +01:00
Juan Basso
c6c7474502 Fix test of the size of lines in MagicDb (included test for it).
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 12:27:57 -05:00
mark_story
7e889d8495 Changing require_once to require for custom session handlers. If you are using a class to do your custom session handling you must include checks to prevent duplicate class errors. Fixes #324 2009-11-22 12:25:53 -05:00
mark_story
6b3b2a629b Removing CakeSession::__validateKeys() its no longer needed due to CakeSession using Set to manipulate the session values. Adding test case for exploit shown in https://trac.cakephp.org/ticket/2041 2009-11-21 20:44:35 -05:00
mark_story
63b047eb57 Replacing extract with classicExtract. 2009-11-21 20:25:45 -05:00