Commit graph

188 commits

Author SHA1 Message Date
mark_story
a3cd80bf52 Merge branch '1.3-bake' into 1.3 2009-09-20 17:42:43 -04:00
mark_story
5717e3b59c Merge branch '1.2' into 1.2-merger
Conflicts:
	app/webroot/test.php
	cake/VERSION.txt
	cake/bootstrap.php
	cake/config/config.php
	cake/console/cake.php
	cake/console/libs/schema.php
	cake/console/templates/skel/webroot/test.php
	cake/libs/configure.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
mark_story
b75779ec06 Updating documentation for __xxx methods. Updating LC_* doc references. Updating other doc blocks for various methods in basics.php Fixes #2. 2009-09-07 00:18:08 -04:00
mark_story
30f8709bb4 Removing use of low() in core classes and functions. Refs #6525 2009-08-27 22:46:00 -04:00
gwoo
6775e0997e Merge branch '1.2' into 1.3 2009-08-03 13:13:18 -07:00
mark_story
72d90f2ce8 Adding tests for array_diff_key() in php4. Increasing test compatibility with php4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8281 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 19:24:38 +00:00
gwoo
bf2b8a60e6 Merge branch '1.3-misc' into 1.3 2009-08-02 12:20:07 -07:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
jperras
d70900c540 Making basics.test.php testDebug more symlink friendly. Adding deprecated tag to global 'uses' method 2009-07-23 16:51:25 -04:00
mark_story
7ca85109cb Updating env(HTTPS); to more accurately reflect the PHP $_SERVER docs. Fixes #6524
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8246 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-22 13:40:12 +00:00
gwoo
508f0651a4 fixes #6492, removing use of define LC_MESSAGES due to inconsistency on different operating systems
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8223 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-06 15:30:04 +00:00
gwoo
72546f3839 fixes #6455, adding define for LC_MESSAGES
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8221 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-05 15:02:03 +00:00
gwoo
7818eae206 fixes #6455, i18n locale message category bug
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8218 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 15:54:26 +00:00
gwoo
a903a4527f fixes #6359, array_intersect_key compatibility with php4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8196 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-16 20:22:41 +00:00
john
0d86c4f7b5 Updating docblocks and including new @link tags.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7812 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-31 19:44:23 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
mark_story
1b456f2cf1 Applying patch from 'davidpersson' fixing code spacing. Closes #5643
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
renan.saddam
6a33ca5b5b Adding tests to __* functions and doing a little refactoring to reduce overload.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7753 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-16 01:11:09 +00:00
AD7six
2cb2ca554c Correcting env('HTTP_BASE') ensuring that when used with no subdomain (http://example.com) it does not return '.com' as the HTTP_BASE
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7679 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-29 18:01:52 +00:00
phpnut
8ae5866a1c Additional optimization refactoring
Removed ability to use deprecated / with plugin, helper, etc combinations. The dot notation is only allowed from this point forward.
Corrected tests for the above changes.
Corrected formating in basics.php

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7623 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-18 03:09:19 +00:00
phpnut
cb487bd6e6 More optimization refactoring.
Fix cache but causing  object_map to be created and deleted on each request.
Replacing function and method calls with better performing code.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7596 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-12 05:11:34 +00:00
DarkAngelBGE
19d4f3d596 adding a couple 'return home early' refactorings
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7572 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-08 20:33:48 +00:00
mark_story
9e9775ee53 Fixing clearCache() no notices are generated. Closes #5012
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7416 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 23:46:53 +00:00
gwoo
4a94397b43 removing deprecated code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7401 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 01:04:03 +00:00
mark_story
551cf75bbc Added check for empty array, removes warning. Closes #5012.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7299 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-29 21:26:37 +00:00
nate
df75a06756 Fixing coding standards violations in core, and adding misc tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7222 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 20:17:23 +00:00
nate
42da5aba81 Moving Cake folder to correct location
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00
DarkAngelBGE
e6e0d852a2 deleting cake folder from svn
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00
gwoo
f7d07012dd cleaning up some deprecated code. renderElement is deprecated, but a the notice was removed for this release. Notice will be thrown in next release and method will be removed in the following release. Refactor of View Caching, along with addition of enabling beforeFilter and component initialize/startup callbacks. Use {{{
//set for the individual action
var $cacheAction = array('view' => array('duration' => '+1 hour', 'callbacks' => false)); 
//globally disable callbacks for all actions
var $cacheAction = array(callbacks' => false, 'view' => '+1 hour');  
//per method
$this->cacheAction = array('duration' => '+1 hour', 'callbacks' => true);
}}}

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7031 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-23 17:43:13 +00:00
the_undefined
f6aa0e0a09 Marked paths() function as deprecated, closes #4615
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6955 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 07:09:53 +00:00
the_undefined
d64bf9b3d8 Marked old cache function as deprecated
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6914 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-17 21:44:17 +00:00
nate
c40bead47c Adding charset/encoding settings to h(), closes #4040
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6541 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-09 21:41:13 +00:00
phpnut
7978745056 "Closes #4029 clearCache deletes more files than expected"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6513 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-08 04:30:55 +00:00
nate
1960be0dfa Deprecating vendor() and removing all instances from the core, fixes #4016
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6497 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-01 05:23:32 +00:00
phpnut
cb53dc61b0 "Closes #2897, Built-in file validation.
Implemented Validation::extension(); and Vaidation::range();
Updated copyright notices in all files"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6296 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-01 22:18:17 +00:00
phpnut
63a4e2e899 "Fixes #3717, Temp files read/write errors under load"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6205 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-22 22:17:42 +00:00
phpnut
de8e7d8b01 "Closes #1854, Core.po not loaded when using /app/locale/..../default.po
Closes #3539
Fixes #3611, Cannot redeclare loadmodels
Fixes #3622, loadControllers() and loadModels() look in wrong folders for AppController resp. AppModel
Added trigger_error to all deprecated functions in basics.php
Refactored I18n class to remove debug_backtrace() usage in basics.php, all translations should be placed in a default.po or .mo file from this point forward.
_ _d() function should be used if domain specific translations are used.
Core translations can be placed in app/locales/{lang}/LC_MESSAGES/core.po or .mo these will now be merged with the specified language strings from default.po will replace the core message strings
All translations are now cached to improve performance.
"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6065 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-23 08:16:23 +00:00
gwoo
fa988bcc18 typo in basics
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6051 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-22 17:38:19 +00:00
gwoo
330058c72f updating env(), fixes #3633
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6048 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-22 17:28:09 +00:00
phpnut
e110032089 "Updating Controller::render() to use App::import() for loading the view class
Corrected typo in basics.php loadView()"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6027 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-19 16:39:14 +00:00
nate
f9e8e82b5b Fixed debug output style for displaying whitespace
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6016 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-17 23:13:52 +00:00
phpnut
c000940e36 Closes #2119 Only define clone() in PHP4 when it hasn't been already defined.
Closes #2213, Support multiple plugin paths.
Closes #2234, filepaths to behavior classes should be cached in class.paths.php also
Closes #2345, ability to group components into subfolders
Closes #2645, Improvement to basic.php for class loading.
Fixes #3526, Cache::write, when using just the config name, it fails.
Fixes #3559, loading plugin model as assoc don't work.
Closes #3567 Controller Folders (Note this does not need routing to work, but controller names can not conflict with others in the same application so naming must still be unique)
Fixes #3579, email.php component: Parse error with php 4.

Adding new class and file importer.
Updated most of the core to use the importer.
Added ClassRegsitry::init() that will create and instance of an object and store it in the registry.
Deprecated most of the load functions in basics.php
Plugin model loading now forces using the dot notation, to use models within a plugin, all the model associations must be in the PluginName.Model syntax, if this is not used, the plugin will look for the models in the main app/models directory first, if not found then it will search the plugin directories recursively until it finds a model.
	var $belongsTo = array('SomeModel'); will look for some_model.php in the app/models
	var $belongsTo = array('MyPlugin.SomeModel'); will look for some_model.php in my_plugin/models
	var $belongsTo = array('MyPlugin.MyPlugin', 'SomeModel'); will used my_plugin/models/my_plugin.php and app/models/some_model.php
	
The controllers of the plugin will still look for the default models inside the plugin if var $uses is not set:
	var $uses = array('SomeModel'); will look for some_model.php in the app/models
	var $uses = array('MyPlugin.SomeModel'); will look for some_model.php in my_plugin/models
	var $uses = array('MyPlugin.MyPlugin', 'SomeModel'); will used my_plugin/models/my_plugin.php and app/models/some_model.php

All of the above will work between plugins and main app
These changes also allow placing model and controllers is sub directories
Removed old class.paths.php file generation 

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6001 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-16 09:35:19 +00:00
gwoo
fbd3811cd1 removing usage of Model::loadInfo() replaced by Model::schema(), removing new lines at the end of some files, removed deprecated chmodr() function from basics, updated bake and scaffold views
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5912 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-28 04:18:18 +00:00
phpnut
7bc90a2eb1 Fixes #3474, Plugin Models Not Loading for 1.2.0.5875 pre-beta release.
Remove deprecated loadPluginController() from basics.php
Fixed changed loadPluginController to loadController in CacheHelper

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5905 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-27 03:27:09 +00:00
gwoo
6dc81ef856 updating i18n functions, fixes #3451
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5881 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-24 01:25:21 +00:00
phpnut
94d1899fd4 Fixes #3441, Sanitize::clean() doesn't pass options when doing recursion on array data
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5872 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 23:34:20 +00:00
mariano.iglesias
896f62544b Changing @return int to @return integer and @param bool to @param boolean
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5860 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:54:36 +00:00
phpnut
160cd28440 Correcting @return int
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5858 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:11:12 +00:00
phpnut
da97a5c871 Correcting @return bool
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5857 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:09:35 +00:00
mariano.iglesias
2e896e5220 Fixing incorrectly position phpdoc blocks.
Adding more documentation to basic CakePHP functions and Dispatcher.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5852 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 06:17:16 +00:00