Commit graph

62 commits

Author SHA1 Message Date
ADmad
38b050a711 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
mark_story
1b610a8d62 Move disabling of bootstrap mode to after init().
init() loads from the cache which can autoload additional classes. For
example the FileEngine adapter loads Inflector. Loading additional
classes causes the file_map cache to be re-written on each request when
using FileEngine. This results in degraded performance when using
FileEngine.

Fixes #3947
2013-08-02 23:20:13 -04:00
ADmad
b7cee8ff57 Ensure Configure::boostrap() doesn't overwrite existing configs under 'App' key.
Fixes #3874
2013-07-31 17:24:36 +05:30
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Phally
83f6161d1d Fixes API parse error for link to Configure::read() in the book. 2013-03-03 20:10:09 +01:00
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09: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
3f4d24bfc0 remove unused local variables and a few improvements 2012-12-23 13:53:13 +01:00
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
ADmad
2bc5988674 Added ConfigReaderInterface::dump() and made all readers' dump() method support 'Plugin.keyname' format for keys. Closes #3363 2012-12-01 00:09:43 +05:30
AD7six
35686c9293 use the right language domain
these messages are for developers, not end users
2012-10-22 10:55:40 +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
euromark
6d3e0a25b2 save some memory usage (PHP < 5.4) in case of huge content and cut off the isset call 2012-09-15 02:33:05 +02:00
Kyle Robinson Young
bc40ac7d3f Remove unused variables and code 2012-09-05 17:19:13 -07:00
euromark
2170d87488 check() for CookieComponent and Configure (similar to CakeSession::check()) 2012-09-04 01:04:48 +02:00
Ceeram
18b860ed1a keeping methods BC, load() now returns false again when configname not default and not configured 2012-07-03 12:43:33 +02:00
Ceeram
19ba09286d Make load() and dump() more consistent with each other, create new PhpReader for default if not configured yet.
Fixes #2998
2012-07-03 12:20:00 +02:00
mark_story
35e0984bec Fix fatal error when E_STRICT is enabled.
If you have E_STRICT enabled and have a strict error in your files, you
would see a fatal error related to Debugger missing.  PHP won't autoload
classes if you are currently in an autoload call, and an error is
triggered.  Preloading Debugger + String in dev mode lets you see the
correct error.
2012-06-24 12:03:31 -04:00
mark_story
d43e0aa0db Update dump() to allow partial dumps. 2012-05-01 21:00:42 -04:00
mark_story
6ba923d20f Make the configure adapters responsible for persistence.
Each adapter should be handling persistence.  This allows
different adapters to handle saving config files in different ways
or places.
2012-05-01 21:00:41 -04:00
mark_story
9f37277dab Add Configure::dump(). 2012-05-01 21:00:41 -04:00
mark_story
f990ecfff3 Add Configure::clear()
Refs #2767
2012-04-14 23:32:29 -04:00
mark_story
e3b124516f Move where set is loaded.
2.1 expects that Configure will load Set.
2012-04-10 21:25:04 -04:00
mark_story
29048b3bb7 Update to use Hash.
Update CakeSession & Configure to use Hash.
2012-03-26 22:25:41 -04:00
mark_story
8fdd57568b Make method protected.
API changes should be minimized in bug fix releases.
Fix broken builds.
2012-03-16 21:46:07 -04:00
mark_story
111db16ca6 Restore error handlers.
When switching error handlers, remember to pop off the stack.
2012-03-16 20:56:24 -04:00
Thomas Ploch
cadfe15549 Fixed problems with custom Error handlers when inclusion of APP bootstrap is defered. 2012-03-15 16:06:54 +01:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
Thomas Ploch
7a93276ecf Move inclusion of application bootstrap behind ErrorHandler initialization in Configure::bootstrap(). 2012-03-08 16:00:13 +01:00
mark_story
63c992a85b Fix coding standards in Core/ 2012-03-03 19:37:46 -05:00
mark_story
1600322a54 Splitting ConfigReaderInterface out into a separate file.
Refs #2514
2012-01-29 13:30:05 -05:00
Jose Lorenzo Rodriguez
81b41aa561 Optimizing Configure::delete(), you can now delete arbitrarily nested keys 2012-01-14 23:30:31 -04:30
Jose Lorenzo Rodriguez
eab2d8aa66 Optimizing Configure::read(), now it is possible to read arbitrarily nested keys 2012-01-14 23:22:08 -04:30
Jose Lorenzo Rodriguez
3a48f64370 Optimizing and simplifying Configure::write(), this also allows arbitrary nesting limit in configure keys 2012-01-14 02:15:31 -04:30
mark_story
87924414fc Update Configure::load() to use Set::merge()
This fixes some of the awkward behavior that using
array_merge_recursive() could create.

Fixes #2441
2012-01-07 10:45:48 -05:00
Jose Lorenzo Rodriguez
91d0a081fb Fixing more links in doc blocks 2011-10-15 11:38:49 -04:30
ADmad
08026e5828 The 'default' config for Configure class is now auto created on first use if not already created. 2011-09-18 00:06:37 +05:30
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
e4a7c8f3d7 Cleanup of minor issues found with phpmd. 2011-08-06 21:15:31 -04:00
Juan Basso
9e75de2f28 Fixed some API doc in core and utility folders. 2011-07-28 23:33:17 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Jose Lorenzo Rodriguez
c6c1bf110d Fixing caching of class loading in App class, this was broken after a recent refactoring
Additionally a new property $bootstrapping is added to App, this is set during the bootstrap process to indicate that classes loaded before the caching is initialized should not trigger the cache write routine.
Performance++
2011-07-15 20:44:39 -04:30
Juan Basso
1c7d54eacc Updated the paths from comments. 2011-06-19 20:28:40 -04:00
mark_story
2650bd4639 Adding missing import that causes a fatal error when a deep
value is written to Configure early on.
Fixes #1753
2011-06-02 21:05:10 -04:00
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
ADmad
4c042ae133 Adding proper visibility keywords for class functions 2011-05-29 03:31:34 +05:30
AD7six
0cb70ae3bb remove CONFIGS constant 2011-05-15 18:34:52 +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
eea981940e Replacing config string in favor of Config 2011-05-13 03:36:45 -04:30
Jose Lorenzo Rodriguez
000e05b468 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/libs/view/helpers/js.php
	cake/tests/lib/templates/missing_conenction.php
	cake/tests/lib/templates/missing_connection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/templates/missing_conenction.php
	lib/Cake/View/Helper/FormHelper.php
	lib/Cake/tests/Case/Core/ConfigureTest.php
2011-04-11 22:48:08 -04:30