Commit graph

6126 commits

Author SHA1 Message Date
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
phpnut
7b78e475ca Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-27 00:55:45 -06:00
phpnut
43fdde2dad Removing unneeded code in Dispatcher::cached();
Fixing path search for themes
2009-11-27 00:49:20 -06:00
mark_story
fd98bc5d76 Expanding tests on Router and RouterRoute. 2009-11-26 23:46:42 -05:00
mark_story
feb0dec970 Starting tests for RouterRouter::parse() 2009-11-26 23:01:54 -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
18e0537869 Adding variable initialization 2009-11-26 17:50:33 -05:00
phpnut
21d2226f75 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-26 14:53:06 -06:00
phpnut
903a1fd95a Adding new Configure::$App['www_root']
Helper::webroot(); will now check for theme assets in APP/webroot/theme/<theme_name>/
Adding ico key to Media::$mimeType;
Fixed bug in previous commits that would not use views/themed/<theme_name>/layouts/ from a plugin
Adding test cases for Helper::webroot();
Adding more tests for ThemeView.
2009-11-26 14:52:38 -06:00
renan.saddam
f9204ebe7c Adding $pos = 0; to avoid php notice. 2009-11-26 17:52:14 -02:00
ADmad
ad20e43730 Removing unneeded code for minor optimization
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-26 09:54:25 -05:00
mark_story
3907893263 Adding tests for incorrect function used in form.ctp.
Fixing mistyped function name. Fixes #364
2009-11-26 09:52:15 -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
phpnut
3ad0595b86 Forgot to add plugin elements for additional tests 2009-11-25 23:20:43 -06:00
mark_story
6661c2fa70 Starting to refactor RouterRoute::_writeRoute 2009-11-26 00:17:43 -05:00
phpnut
f83a024a10 Increasing code coverage for View and ThemeView 2009-11-25 23:17:15 -06:00
phpnut
948f6b21e5 Refactored last commit changes are:
To override plugin views with a themed version of the view you would create:
<app_name>/views/themed/<theme_name>/plugins/<plugin_name>/<controller_name>/*.ctp

To override plugin views at the app view level you would create:
<app_name>/views/plugins/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:58:02 -06:00
mark_story
0b9ae92eb9 Adding a test case for RouterRoute to increase code coverage. 2009-11-25 23:51:27 -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
phpnut
21eb001a96 Refactoring themes/views to use a centralized location instead of allowing plugins to have themes.
The plugin should include all required views/assets, to override these at the application level using themes you would create:
<app_name>/views/themed/<theme_name>/<plugin_name>/<controller_name>/*.ctp

if you are not using themes you can override them at the app view level:
<app_name>/views/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:29:54 -06: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
dc769041f3 Updating project task test case to reflect changes in skel dir. 2009-11-25 22:52:33 -05:00
mark_story
ae98a556d6 Removing vendors/img, vendors/css and vendors/js from skel dirs. 2009-11-25 22:51:33 -05:00
mark_story
dd4fbbab45 Updating PluginTask to create webroot dir and no longer create vendors/css, vendors/js and vendors/img 2009-11-25 22:50:50 -05:00
mark_story
10119f52c8 Removing INFLECTIONS it pointed at a directory that didn't exist. 2009-11-25 22:27:22 -05:00
mark_story
ee26bb5259 Removing PEAR. Its not a core path, and can be added in at app/config/bootstrap.php if needed. 2009-11-25 22:24:59 -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
2eb85ef558 Removed App::path('plugins'); in favor of App::pluginPath($plugin); removing need for foreach() 2009-11-25 13:04:30 -06: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
49c11a8219 More work allowing assets in themes and plugins. 2009-11-25 11:06:28 -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
64dffb7663 Moving shared method from DboMysqli and DboMysql up to DboMysqlBase. Fixes #358 2009-11-24 22:49:40 -05: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
dogmatic
51d0805ce0 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:23:23 -05:00
mark_story
d758dbc343 Updating cake.generic.css to let .altrow class to apply to dd and dt elements. Fixes #361 2009-11-24 19:57:20 -05:00
mark_story
58446e0785 Adding documentation note about $options['q'] Refs #357 2009-11-24 11:57:56 -05:00
mark_story
72c0e2ca5a Applying minor optimization from 'robustsolution' to Router::connectNamed().
Fixes #312
2009-11-24 09:27:13 -05:00
mark_story
5aba143620 Applying optimization to Controller::postConditions from 'robustsolution' Fixes #287 2009-11-23 12:52:38 -05:00
mark_story
c94702506d Fixing fails in Set::reverse caused by _log property being removed from Object. 2009-11-22 21:31:44 -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
33ef318fce Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-22 18:19:03 -05:00
ceeram
cd6fd74caf Added -empty flag for ProjectTask to bake with empty dir files, tests included
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 18:18:14 -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
mark_story
6c3bcdd7e6 Removing commented code. 2009-11-22 17:34:11 -05:00
AD7six
4f3852618f correcting $this -> $self
removing debug code
2009-11-22 19:58:10 +01:00
robustsolution
b0aec35422 Dispatch::baseUrl() needs optimization a little bit
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 12:30:54 -05: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
f038cb8ffb Updating default bake templates to exclude primary key input for all actions containing 'add'
Fixes #319
2009-11-21 21:10:31 -05:00
mark_story
a30aec99fd Applying patch from 'robustsolution' for optimization in Dispatcher::dispatch. Fixes #317 2009-11-21 21:00:15 -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
mark_story
4ea2a3f37d Minor optimization on importing of Cache engines. 2009-11-21 20:05:19 -05:00
mark_story
fa0d0addf8 Making it so Cache::__loadEngine is only called once per classname. 2009-11-21 20:01:33 -05:00
mark_story
46b965edba Refactoring Configure::read/Configure::write so keys with <= 2 keys read/write faster. 2009-11-21 19:57:04 -05:00
mark_story
a729fc4d62 Merge branch '1.3-cache' into 1.3-misc 2009-11-21 17:16:38 -05:00
mark_story
c11509483c Removing use of Helper::output from core helpers.
Removing duplicated test caused by merge in form helper test.
2009-11-21 16:43:54 -05:00
mark_story
d37dd4c49f Updating doc block for FileEngine.
Fixing Cache::set() so strtotime compatible durations are handled properly.
Restoring previous change in Xcache test case.
2009-11-21 16:09:06 -05:00
mark_story
fb7d99e6b3 Making XcacheTest use refactored Cache API. 2009-11-21 15:44:03 -05:00
mark_story
3f067ed166 Updating ApcEngine test to use the new Cache engine api. 2009-11-21 15:26:17 -05:00
mark_story
5ff2e66f75 Updating memcache test to use new Cache api.
Removing most private access in the test case.
2009-11-21 15:26:17 -05:00
mark_story
266cddb4db Removing whitespace. 2009-11-21 15:26:16 -05:00
mark_story
4b184ceccb Updating FileEngine test to use new Cache api methods. 2009-11-21 15:26:16 -05:00
mark_story
e3e02bfcee Fixing drop() 2009-11-21 15:26:16 -05:00
mark_story
14d643ff99 Fixing File cache test to run with modified Cache API. 2009-11-21 15:26:16 -05:00
mark_story
95f8ed5b55 Additional refactoring and code removal. 2009-11-21 15:26:16 -05:00
mark_story
0ba622bb0e Removing debug changes.
Updating isInitialized() to its new use.
Refactoring Cache engines to no longer be singletons with heavy settings manipulation. Instead each config() is a separate instance.
2009-11-21 15:26:16 -05:00
mark_story
3404f1ed39 Adding documentation to Cache::config().
Adding tests for default configuration manipulation of config().
2009-11-21 15:26:16 -05:00
mark_story
d1066bfeaf Updating FileLog to include File if it does not already exist, fixes possible fatal errors if log was written to during the bootstrap process. 2009-11-21 15:21:19 -05:00
mark_story
b1c89496c5 Fixing typo in Cache doc block.
Updating formatting in Xcache doc block.
Fixing Xcache test case so it passes when username and password are not user & password.
2009-11-21 15:19:11 -05:00
mark_story
a96c157d94 Applying optimizations to use of count() from 'jrbasso' 2009-11-21 15:14:21 -05:00
Juan Basso
71df8dbbba Replace function sizeof (alias) by count.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:50:57 -05:00
Juan Basso
52fcabc96a Little optimization in redirect of controller.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:47:42 -05:00
Juan Basso
1cef0ac981 Little optimization in postConditions of controller.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:46:49 -05:00
Juan Basso
1c0c1bc9c7 Replace function split by explode when possible.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:45:04 -05:00
Juan Basso
911a99bf23 Replace function preg_split by explode when possible.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:52 -05:00
Juan Basso
df9e1e0bd1 Replace function join (alias) by implode.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05:00
Juan Basso
1acc60b04c Replace function die (alias) by exit.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:38:11 -05:00
Juan Basso
9b6b258fed Replace function is_integer (alias) by is_int.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:36:10 -05:00
renan.saddam
4a8808eb21 Removing the argument passed to mssql_get_last_message(), it does not accept any argument. 2009-11-19 16:35:29 -02:00
renan.saddam
a33bd1d144 Removing the argument passed to mssql_get_last_message(), it does not accept any argument. 2009-11-19 16:28:11 -02:00
predominant
97239f0259 Adding newline. 2009-11-18 22:28:03 +11:00
mark_story
94c0ec1699 Adding libs to templates/skel so baked projects contain an app/libs dir. 2009-11-17 10:27:09 -05:00
burzum
67cea6d21c Fixing a problem with setting Paginator::sort() defaults directon to desc 2009-11-17 02:11:23 +01:00
mark_story
9eb1950646 Removing duplicate condition check. Fixes #314 2009-11-16 20:10:08 -05:00
mark_story
925fda7ba6 Updating core layout, and skel layout to reflect changes in session->flash().
Updating skel layout to use $this->Helper.
2009-11-16 20:01:55 -05:00
Jippi
e6801c22e1 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-16 23:19:11 +00:00
Jippi
f078b0aeda Fixed Router::url() not being able to leave an URL with persist parameters 2009-11-16 23:16:49 +00:00
Jippi
2cb0c3acb3 Changed SessionHelper::flash to return message instead of echoing it 2009-11-16 23:15:24 +00:00
phpnut
cc11230925 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-16 10:14:35 -06:00
phpnut
7211541821 Removing 1024 char limit when using fgets() 2009-11-16 10:14:03 -06:00
mark_story
86ce1a941c Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3 2009-11-16 10:09:33 -05:00
mark_story
89558dc4af Fixing issues with models using default inflected tables instead of their actual tables when detecting associations. Fixes #315 2009-11-16 09:24:52 -05:00
mark_story
ddb9f8924c Updating i18n shell to use updated schema shell api. 2009-11-16 09:12:41 -05:00
predominant
a91108a81a Adding version check to getCharsetName() for MySQL Datasource. 2009-11-16 13:49:52 +11:00
mark_story
aa97daeea9 Updating test due to merge conflicts. 2009-11-15 20:09:35 -05:00
mark_story
acd2c15690 Merge branch '1.3-misc' into 1.3-merger
Conflicts:
	cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -05:00
mark_story
58383d3cb9 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/model.php
2009-11-15 20:05:55 -05:00
mark_story
0783176238 Replacing duplicated code with pluginSplit().
Updating test case.
2009-11-15 19:55:20 -05:00
mark_story
a292ef0f16 Adding ability to provide default plugin value to pluginSplit(). 2009-11-15 19:54:33 -05:00
mark_story
20a114a1cd Adding $dotAppend to pluginSplit() 2009-11-15 19:12:00 -05:00
mark_story
db0c030557 Adding pluginSplit and test case. pluginSplit consolidates a number of repeated code blocks. 2009-11-15 18:16:12 -05:00
mark_story
28d3488cb2 Adding file headers to config files in test app.
Updating doc blocks.
Updating formatting.
2009-11-15 18:09:04 -05:00
ceeram
7a4793a20c refactoring Configure::load() to load config files from plugins, tests and config files added
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-15 17:56:49 -05:00
mark_story
63ab96d751 Setting $primary = false inside DboSource::queryAssociation. Fixed #208 2009-11-15 17:48:41 -05:00
mark_story
ea6e3dd076 Fixing issue with bake model <name> 2009-11-15 16:47:58 -05:00
mark_story
e1d60368f6 Adding missing reference operator. 2009-11-15 16:38:15 -05:00
mark_story
31102ad412 Adding tests for App::pluginPath that were omitted before. 2009-11-15 16:38:02 -05:00
mark_story
6039d6ebe4 Applying optimization in Dispatcher::parseParams() from 'robustsolution'. Fixes #309 2009-11-15 15:32:58 -05:00
predominant
0049c9ad81 Renaming Helper::__name to Helper::_name for proper access level for extension overloading and callback. 2009-11-15 21:18:46 +11:00
mark_story
0b2fc5b35f Adding tests for phone() pass through to localized class. 2009-11-14 20:52:11 -05:00
mark_story
fa14f9cebc Merge branch '1.3-validation' into 1.3-misc 2009-11-14 20:46:48 -05:00
mark_story
b452e8367f Adding tests for CakeLog::drop() 2009-11-14 20:44:42 -05:00
mark_story
be9f0ec4c7 Renaming method so they match those in Cache.
Removing method that was missed during previous refactor.
Updating tests.
2009-11-14 20:42:57 -05:00
mark_story
fb483e9bff Adding file headers. 2009-11-14 20:25:45 -05:00
mark_story
b7e7eff738 Fixing doc blocks. 2009-11-14 20:24:18 -05:00
mark_story
70820e2e96 Renaming unconfig to drop. 2009-11-14 20:18:58 -05:00
mark_story
caedbdf98a Adding Cache::configured() and Cache::unconfig(). configured() allows introspection on the currently configured settings. unconfig() allows for the removal of cache configs.
Tests added.
2009-11-14 20:10:40 -05:00
mark_story
59a7cee89d Removing deprecated $config parameter handling. $config must be a string that is the name of an existing cache config. 2009-11-14 20:10:40 -05:00
mark_story
040f94cb81 Adding test case files used for previous commit. 2009-11-14 20:10:40 -05:00
mark_story
b6978ab25f Adding the ability to load cache engine classes from plugins and app libs.
Also enabled the ability for App cache classes to override core ones.
Test cases added.
Removed unnecessary subclassing of Object.
2009-11-14 20:10:40 -05:00
mark_story
3c349dd15c Removing unnecessary inheritance from Object. 2009-11-14 20:10:40 -05:00
mark_story
2740fd6714 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-14 19:42:24 -05:00
mark_story
17e377de7e Updating doc block for MemcacheEngine 2009-11-14 19:40:30 -05:00
ADmad
862ff82ad4 Updating Configure::store to fix escaping issues
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-14 19:38:53 -05:00
mark_story
06d4e5e553 Reformatting code in memcache.
Adding unset() to test case to remove unnecessary keys that can cause test failure.
2009-11-14 18:50:23 -05:00
mark_story
3712072531 Applying optimization to Router::connect() from 'robustsolution' Fixes #302 2009-11-14 16:32:18 -05:00
mark_story
8b1a2b1f72 Applying optimization in Router::__parseExtension from 'robustsolution'. Fixes #301 2009-11-14 16:29:33 -05:00
predominant
ac86ad05ac Moving access modifier doc tag. 2009-11-14 23:38:52 +11:00
predominant
0977b3fe15 Standardising docblock endings throughout. 2009-11-14 23:19:25 +11:00
predominant
5092262d4d Reformatting and adding missing documentation blocks. 2009-11-14 23:18:31 +11:00
mark_story
9376826aa4 Fixing HttpSocket::buildUri when host key is empty.
Tests added
Fixes #271
2009-11-13 14:42:40 -05:00
mark_story
360ea2a46a Adding extract task to Console Group test. 2009-11-13 10:24:36 -05:00
mark_story
d93c94f702 Fixing failing test, picked in from 1.2. 2009-11-13 09:53:31 -05:00
mark_story
bfde6b81fe Adding test to form helper to increase code coverage. 2009-11-13 09:48:31 -05:00
mark_story
8d407ac915 Adding test to form helper to increase code coverage. 2009-11-13 09:45:25 -05:00
mark_story
d302ed1bfa Fixing comment block formatting. 2009-11-13 09:44:51 -05:00
ceeram
a67a97722a refs #291
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-13 09:25:47 -05:00