Commit graph

234 commits

Author SHA1 Message Date
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
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
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
predominant
0977b3fe15 Standardising docblock endings throughout. 2009-11-14 23:19:25 +11:00
mark_story
fa1b7f617f Fixing issues caused by merge with 1.2. 2009-11-09 14:07:19 -05:00
mark_story
6b5c247162 Merge commit 'origin/1.2' into mergers
Conflicts:
	cake/bootstrap.php
	cake/console/cake.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
mark_story
82a2b1a019 Changing import of Dispatcher to direct require.
Modifying order of operations in Configure::__loadBootstrap()
moving inclusion of app/config/bootstrap.php after the creation of core cache configs.  This allows App::import() to be used in the bootstrap file with cached paths.
2009-11-07 17:53:14 -05:00
predominant
1185681549 Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0 Update license lines throughout. 2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed Fixing links throughout 2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8 Removing excess whitespace 2009-11-06 17:08:23 +11:00
predominant
6782cb019c Update CakePHP Project link. 2009-11-06 17:00:11 +11:00
predominant
5dfe1777af Removing Subversion file headers. 2009-11-06 16:51:09 +11:00
predominant
ceee56013c Remove Subversion $Date$ lines. 2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe Remove Subversion $LastChangedBy$ lines. 2009-11-06 16:11:16 +11:00
predominant
42f3f16d60 Remove subversion $Revision$ lines. 2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e Updating Copyright date to include 2009. 2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
predominant
7383e97115 Adding datasources array to Configure. 2009-11-04 14:45:44 +11:00
renan.saddam
84a10904fb Fixing typo on variable name. 2009-10-30 18:42:04 -02:00
SkieDr
fb64d14442 Add support libs folder into app and plugins that will allow to split users and vendors code. Libs files should follow cake naming conventions for files names and classes. 2009-10-21 14:59:12 +04:00
mark_story
de8f251758 Replacing $pluginPath loops with App::pluginPath(). Minor optimization for App::pluginPath(). 2009-10-14 09:28:06 -04:00
mark_story
58e9c0e328 Fixing typo. 2009-10-03 11:48:02 -04:00
mark_story
e5088f7613 Adding App::pluginPath() to find paths for plugins. 2009-10-03 11:48:02 -04:00
mark_story
cac09481ac Removing support for DEBUG constant. Use Configure::write('debug', 2) instead.
Adding 'log' interaction to error reporting settings controlled by Configure::write().
2009-09-07 23:28:50 -04:00
nate
a5c00de3bd Applying PHP 5.3 compatibility patch from. Please update your config/core.php, webroot/index.php and webroot/test.php accordingly. 2009-09-07 14:25:22 -04:00
AD7six
96cebeede9 correcting global plugin path logic to match global vendors folder 2009-08-12 09:46:18 -04:00
AD7six
94e986561b allowing install/cake-wide plugins 2009-08-02 15:01:15 -07:00
nate
e47b1960ad Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3 2009-07-31 11:54:01 -04:00
nate
729d8fddea Applying PHP 5.3 compatibility patch from Mark Story. Please update your config/core.php, webroot/index.php and webroot/test.php accordingly. 2009-07-31 11:48:30 -04:00
gwoo
01d22ffd2e fixing up some App::import calls 2009-07-30 15:01:22 -07:00
gwoo
062f471b7f updating App::import usage. ran each test and everything seems ok. 2009-07-25 18:27:02 -07:00
gwoo
df6d62764f updating App::objects cache support 2009-07-25 15:57:49 -07:00
gwoo
cfb46024d7 fixing Configure where Set is not found.also adding to CakeSession 2009-07-25 12:32:02 -07:00
gwoo
766e12bc2a Merge branch '1.3' into 1.3-newlines 2009-07-25 10:41:40 -07:00
gwoo
1924eb9dde updating configure and debugger 2009-07-25 10:27:17 -07:00
gwoo
9a909c553f updating configure to handle infinite depths of keys. thanks to farhadi. 2009-07-24 13:50:50 -07:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
gwoo
f295a21831 updating some code related to Configure/App changes. Fixing issue when cache is not configured 2009-07-22 09:11:38 -07:00
gwoo
9b4e08e93b fixing error in import map when cache is empty 2009-06-14 10:28:30 -07:00
gwoo
f9339e3c81 simplified App::path(). Changed App::build() to handle all paths.
tests passing.
2009-06-11 09:13:16 -07:00
gwoo
c3643767bf some more updates to path handling 2009-06-10 16:13:39 -07:00
gwoo
24d78dd671 moving path configuration to App class 2009-06-07 15:24:10 -07:00
mark_story
4b00c29eef Updating doc blocks to improve readability in API.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8015 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-04 05:00:59 +00:00
phpnut
e102144d42 Closes #5820, Duplicate value in result of Configure::corePaths();
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7936 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-18 00:12:27 +00:00
nate
8eade1adb3 Fixing code formatting to wrap at 100 characters, adding fix for ticket #5596, counterCache now decrements properly when foreign key value changes.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7927 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-17 04:13:45 +00:00
renan.saddam
6319f8ea69 Removed trailing whitespaces from core.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7847 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:54:07 +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
john
b5a77bc0a9 Space-aligning header.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7788 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-28 17:29:28 +00:00
john
a9a3bbcc6b Updating docblock wording; adding @link tags where applicable.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7787 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-28 17:08:14 +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
gwoo
f861d685d5 refactoring shell paths, also closes #5451, shell to return exit values
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7762 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-18 19:54:56 +00:00
phpnut
760f79f4ec Closes #1855, Separate translation files per plugin. This is now supported using !__d() and !__dn().
Example singular usage: !__d('plugin_name', $string, true); returns translated singular string from pluginsPath/plugin_name/locale/"language"/LC_MESSAGE/plugin_name.(po/mo).
	Example plural usage: sprintf(!__dn('plugin_name', '%d = 1', '%d = 0 or > 1', $number, true), $number ); returns translated plural strings from pluginsPath/plugin_name/locale/"language"/LC_MESSAGE/plugin_name.(po/mo).
Closes #5007, Support for multiple additional locale paths. Configure::write('localePaths', $paths); accepts an array of $paths. $localePaths = array(); can also be used in bootstrap.php
Added Configure::$shellPaths; additional paths can be set in bootstrap.php $shellPaths = array();

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7754 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-16 05:16:00 +00:00
phpnut
f51ae718e6 Closes #5607, Configure::store can no longer be uses statically.
Corrected test cases to call Configure statically.
Added fixes for tests added in [7741]
Closes #5594, Related models should be built when $useTable = false;

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7748 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-15 17:30:08 +00:00
phpnut
2f85fefa29 Closes #5557 model.php and App::__settings try to import inexistent class Behavior
Removed loading of ModelBehavior in App::__settings(); this it not needed since the behavior is loaded in the model.
Added additional optimizations.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7733 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-12 02:33:12 +00:00
mark_story
e8945ef04f Fixing doc block and method visibility doc tag for Configure::buildPaths(). Closes #5488
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7672 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-27 14:56:32 +00:00
mark_story
370b20dce6 Minor optimizations
Closes #5249 and #5282

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7664 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-26 00:46:53 +00:00
mark_story
62168bfe0f Updating doc blocks to include access and return PHPDOC tags.
Removing use of e() in Debugger.
Fixing code formatting in CookieComponent
Closes #5477

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7662 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-25 16:49:56 +00:00
DarkAngelBGE
cc425a5e0a adding a couple whitespace corrections (trailing tabs, newlines, ..)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7654 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-24 11:52:29 +00:00
mark_story
3662f8c4d0 Changing how Folder Class is loaded. Fixes infinite loops resulting in segfault under apache 2 when Cache.disable = true and debug = 0. Closes #5458
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7651 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-24 00:33:54 +00:00
phpnut
5658e26e07 Changing comparison operators to === (identical) which is faster than == (equal)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7604 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-14 17:17:49 +00:00
phpnut
2b95df3abf Additional optimization refactoring
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7597 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-13 18:59:30 +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
phpnut
a14e939ac4 Reverting some of the changes made in [7578]
Removed usage like: $var = $foo = $bar = null;
Replaced with:
$var = null;
$foo = null;
$bar = null;

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7584 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-09 11:32:18 +00:00
DarkAngelBGE
823d9252de minor refactorings for the configure class
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7578 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-09 05:26:09 +00:00
phpnut
6bdc60731f Adding more changes to improve performance. Fixes loading of Models when instance has already been created in the registry
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7527 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-27 16:43:15 +00:00
phpnut
80fa429785 Adding fix for undefined notice in vendors.php
Removed check for required file in Cache::!__loadEngine();
Fixed cache being wrote on each request from Configure::listObjects(); when data was an empty array
Removed extra call to App::getInstance(); in App::import();
Moved setting of App::!__loaded; inside of if statement.
Removed cake core install directory paths from the cached dir_map.
Changed uses('file'); to require statement in file.php
Changed uses('set'); to require statement in inflector.php
Removed check for existing inflections.php since this file has been included in 1.2 since Dev releases.
Added additional test for Helper::clean();
Fixed bug in Helper::!__clean();
Fixed random output of 1 when using MediaView;
Added csv mime type to MediaView



git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7516 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-27 03:42:17 +00:00
gwoo
18c0e70151 fixing root vendor path which was changed in 7422
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7431 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-04 20:09:27 +00:00
AD7six
0bfaa1ab89 Modifying the core path method to break on the first found core installation
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7422 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-02 19:49:54 +00:00
gwoo
caa7bb6218 updating cache engines so key will expire when duration is changed, updated datasource and configure to for new settings, closes #5083
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7364 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-26 20:00:20 +00:00
mark_story
2bf7181f05 Added check to Configure::getPaths() to account for chroot 'ed hosting. Tested with open_basedir. Closes #5093
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7349 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-22 01:12:53 +00:00
phpnut
822c8978a9 Fixes #5002 Model name in PaginatorHelper sortKey.
Closes #5032
Small performance improvement in App::!__load();

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7312 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-05 09:44:42 +00:00
gwoo
3ab12a868f updating controller test. closes #5029, if you change the content type with request handler in a test debug must be set to 0, see line 630 of RequestHandler. Fixed duration handling for core cache settings when debug equal to 1
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7309 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-04 13:26:43 +00:00
phpnut
022ffa3f4f Adding fixes for pagination on associated models.
Corrected dot notation use in Controller::paginate();

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7286 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 06:25:08 +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
gwoo
5257c95316 #fixes 4940, use default config
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7207 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-18 17:18:26 +00:00
gwoo
193959ebf3 closes #3901 unnecessary setting of path in App::__settings, closes #4115 DboSource::fetchAll() does not need resultSet for every row
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7205 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-17 15:43:08 +00:00
gwoo
b5c4681a11 fixes #4893, open_basedir errors messages
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7204 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-17 05:47:11 +00:00
mark_story
dada609521 Fixed issue where setting debug did not properly set error reporting level, test case added. Closes #4903
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7178 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-13 14:04:28 +00:00
gwoo
1e231e9511 some cleanup, wrapping uses() in class exists
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7172 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-11 15:46:31 +00:00
phpnut
8a30290862 Fixes #4883 Duplicated component name
Removed bad test since AppController::beforeFilter() is now run when Controller::constructClasses() is called.
Fixed bug with App::import() not caching properly.
More performance changes

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7169 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-11 08:54:27 +00:00
gwoo
a7289ff89d updating cache engine to better deal with prefixes for multiple apps. Allows fully or partially overriding core settings from core.php. fixes #4810
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7089 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-02 17:35:56 +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
mark_story
6ed1fc8fbe Corrected CONFIGS usage in Helper and Configure as per patch from 'zeuthen'.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7041 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-24 22:46:40 +00:00
gwoo
92514422e4 updating datasource to use Cache engines.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7037 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-24 02:08:56 +00:00
gwoo
d3f772cfb4 updating configure
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7019 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-23 04:46:03 +00:00
gwoo
8dc7515045 fixes #4729, configure notice on cache path
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7007 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-22 14:18:21 +00:00
gwoo
200315efc8 proper fix for #4710
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6993 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-21 16:14:18 +00:00
gwoo
6ef2b78389 fixes #4710, cake core using settings for default cache
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6992 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-21 15:41:02 +00:00
mariano.iglesias
35391deff5 Renaming configs to config and fixing Acl test.
Bringing Configure test coverage up to 82%, the best that can be achieved without calling __loadBootstrap(true) which will cause constant collision.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6932 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-18 22:51:29 +00:00
the_undefined
d9e6ee6494 Fixed a problem in Configure causing the File engines default path to be ignored , closes #4673
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6916 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-17 21:47:06 +00:00
the_undefined
7e4224a1f9 Fixed a problem in App::__overload causing issues in PHP4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6915 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-17 21:45:25 +00:00
gwoo
18b627636b updating cake.test.php, fixes #4638. updating cake.php, fixes #4648 (with tests), updated Cache
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6870 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-14 19:43:55 +00:00
phpnut
8a5505bdcc "Fixes #4436, App::import() loads wrong file"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6643 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-09 05:04:09 +00:00
phpnut
92c466c0dc "Fixes #4336, Setting a Configure key to null causes php warning."
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6598 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-22 21:55:44 +00:00
phpnut
a6fbe05964 "Initial refactoring of BehaviorCollection.
Fixed vendor path being the first searched directory for files, this caused unexpected results.
Fixed failing DboSource tests"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6583 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-16 05:44:20 +00:00
phpnut
fa61b3fbda "Resetting numeric keys for paths"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6572 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-15 05:16:18 +00:00