adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-18 04:48:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
17711 commits 7 branches 0 tags 44 MiB
Commit graph

171 commits

Author SHA1 Message Date
Jose Lorenzo Rodriguez
042221bbf6 Merge branch '2.2-redis-engine' into 2.2 2012-04-22 19:14:24 -04:30
Jose Lorenzo Rodriguez
9f415d012c Merge branch '2.2-cache-groups' into 2.2 
Conflicts:
	lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
 2012-04-22 18:59:22 -04:30
Jose Lorenzo Rodriguez
e73bb27450 Merge remote-tracking branch 'origin/2.2-redis-engine' into 2.2-redis-engine 2012-04-11 23:24:39 -04:30
Jose Lorenzo Rodriguez
d588758783 Removing extra space after boolean cast 2012-04-11 23:22:38 -04:30
José Lorenzo Rodríguez
4958f0ee5d Using a more specific function to check for numbers on redis engine read 2012-03-28 23:22:30 -05:30
José Lorenzo Rodríguez
e6a87bac40 Removing extra spaces 2012-03-28 23:18:32 -05:30
Jose Lorenzo Rodriguez
f105abde4e Implementing Redis cache engine 2012-03-28 23:30:33 -04:30
Jose Lorenzo Rodriguez
2bb3dc6bf7 Reducing key length when using groups in WincacheEngine 2012-03-27 00:07:23 -04:30
Jose Lorenzo Rodriguez
afba5aafb7 Redcing key name when using groups in MemcacheEngine 2012-03-27 00:05:56 -04:30
Jose Lorenzo Rodriguez
27b90b0e47 Reducing key size when using groups in ApcEngine 2012-03-27 00:01:34 -04:30
Jose Lorenzo Rodriguez
2100a64ffd Prefixing group names in XcacheEngine 2012-03-27 00:00:52 -04:30
Jose Lorenzo Rodriguez
ffdd98be1b Prefixing group names in WincacheEngine 2012-03-26 23:35:15 -04:30
Jose Lorenzo Rodriguez
98b14ff144 Prefixing group names in MemcacheEgine 2012-03-26 23:34:03 -04:30
Jose Lorenzo Rodriguez
957322ec82 Prefixing group names with the cache enging prefix to avoid possible conflicts with shared servers 2012-03-26 23:02:26 -04:30
Jose Lorenzo Rodriguez
cf2b6acd71 Fixing some typos 2012-03-26 00:29:02 -04:30
Jose Lorenzo Rodriguez
945925bdb9 Implemented group cache delete in FileEngine 2012-03-25 23:33:37 -04:30
Jose Lorenzo Rodriguez
04ec41384b Implemented read/write support for groups in FileEngine 2012-03-25 23:00:28 -04:30
Jose Lorenzo Rodriguez
c5c99a7c29 Implemented group support in WincacheEngine 2012-03-25 22:34:04 -04:30
Jose Lorenzo Rodriguez
9c733b4420 Implementing group support for XcacheEngine 2012-03-25 22:20:39 -04:30
Jose Lorenzo Rodriguez
6f9d2c01db Implmented cache group clearing in Memcache engine 2012-03-25 21:23:27 -04:30
Jose Lorenzo Rodriguez
411bd85900 Implementing group read/write support to MemcacheEngine 2012-03-25 20:08:37 -04:30
Jose Lorenzo Rodriguez
4f131d54f1 Implemented group delete for cache keys in ApcEngine 2012-03-25 19:45:32 -04:30
Jose Lorenzo Rodriguez
3c9c3ef9ba Implemented group read/write support for the ApcEngine 2012-03-25 19:17:08 -04:30
Thomas Ploch
fda065101b Fixed test cases for successful being built on travis. 2012-03-24 21:32:31 +01:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
04c843b17b Fix coding standards in Cache/ 2012-03-03 17:34:13 -05:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -05:00
euromark
a41539dfa4 Indentation fix (tab instead of spaces) 
Fixes #2398

Conflicts:

	lib/Cake/Test/Case/Console/Command/ShellTest.php

Signed-off-by: mark_story <mark@mark-story.com>
 2011-12-20 22:26:43 -05:00
Kyle Robinson Young
c836ba08a3 Add/move docblocks to make text available in the API docs 2011-12-08 07:35:02 -08:00
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
Kyle Robinson Young
8197f87dbc Spelling and grammar fixes 2011-12-01 21:58:09 -08:00
Kyle Robinson Young
94e119fe67 Adhere to code formatting standard 2011-11-30 23:21:31 -08:00
mark_story
95737d7adf Fix issue writing to file cache 
Reading/writing to the same file cache key multiple times
in a row during a single request would result in failed reads.

Fixes #2114
 2011-10-18 21:21:05 -04:00
mark_story
d7155d374b Making apc feature test rely on apc_dec. 
ZCS comes with a busted apc, and we need apc_dec to properly
use the ApcEngine anyways.

Fixes #2105
 2011-10-18 20:48:58 -04:00
mark_story
1731b62644 Fix recursive errors caused by unwritable cache directories. 
Fixes #2104
 2011-10-16 18:51:02 -04:00
Thomas Ploch
0a70963a74 Removed creation of unneeded file handle object in FileEngine::write(). Added configuration option 'mask' to FileEngine::. Now able to provide a permission mask to create cache files with specific permissions. 
Set '0664' as default value for the 'mask' setting in FileEngine::. Adjusted corresponding test cases.
Added new warning if the file could not be opened for writing.
 2011-10-14 16:47:18 -04:30
mark_story
79687a2dcf Making locking file caching the default. 
Locking files prevents many issues with unserialize() warnings
caused by partially written files.
Fix a locking issue where files would be left locked.
Fixes #1988
 2011-09-25 09:26:32 -04:00
mark_story
6a4e7558fc Merge branch '1.3' into merger 
Conflicts:
	cake/basics.php
	cake/console/libs/tasks/extract.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/test_app/views/pages/extract.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Model/Behavior/ContainableBehavior.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
 2011-09-18 12:09:04 -04:00
mark_story
4a7bd031e5 Adding a file_exists() check before unlinking cache files. 
This prevents issues where two concurrent requests could
be clearing the same cache files.
Fixes #1936
 2011-08-27 11:52:29 -04:00
Juan Basso
7d0250ff47 Merge branch '2.0-api-doc' into 2.0 2011-08-26 20:22:26 -04:00
Mark Story
0091fac5b9 Adding prefix based cache clearning to Wincache. 
This matches APC and Memcache.
Fixes #1911
 2011-08-20 09:27:33 -04:00
Mark Story
ef921fa56f Making ApcEngine::clear() only clear keys with a matching 
prefix. Refs #1911
 2011-08-20 09:27:33 -04:00
Juan Basso
a1a049c700 Merge remote-tracking branch 'origin/2.0' into 2.0-api-doc 
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/View/Helper/CacheHelper.php
 2011-08-20 01:47:27 -04:00
Juan Basso
61833294f0 Changed the visibility to methods that not affect others classes. 2011-08-20 01:39:30 -04:00
Juan Basso
3dd86ebfd4 Fixed the Memcache::clear() to not flush all the server, just the variables associated with the prefix. Refs #1911 2011-08-19 22:12:37 -04:00
Juan Basso
16ef234180 Removing trailing spaces. 2011-08-15 23:55:08 -04:00
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
e29eb1cb03 Fixing failing cache tests. 2011-08-14 14:45:47 -04:00
mark_story
d93c8cb200 Merge branch '1.3' into merger 
Conflicts:
	cake/libs/controller/components/security.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/view.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php
	lib/Cake/Test/Case/Utility/SetTest.php
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/CacheHelper.php
 2011-08-14 14:39:49 -04:00
Juan Basso
895c10af7b Adjusted some types in @param, @return and @var. 2011-07-31 22:57:17 -04:00
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Juan Basso
e4a1816557 Changed the signature of methods to avoid strict messages. 2011-07-30 19:17:20 -04:00
Juan Basso
e74d835a62 Fixed some API doc in routing and cache. 2011-07-30 17:02:25 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Jose Lorenzo Rodriguez
febf28f34b Merge remote-tracking branch 'origin/1.3' into 2.0 
Conflicts:
	cake/console/templates/default/views/home.ctp
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/media.test.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/test_app/views/pages/home.ctp
	lib/Cake/Cache/Engine/ApcEngine.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/View/Helper/FormHelper.php
 2011-07-25 14:44:23 -04:30
Mark Story
91a1cf81f3 Merge branch '1.3' into merger 
Conflicts:
	app/Config/acl.ini.php
	app/config/database.php.default
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	cake/basics.php
	cake/bootstrap.php
	cake/config/paths.php
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/bake.php
	cake/console/libs/i18n.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/testsuite.php
	cake/console/templates/default/classes/test.ctp
	cake/console/templates/default/views/home.ctp
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/views/elements/email/text/default.ctp
	cake/console/templates/skel/webroot/css.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cake_session.php
	cake/libs/configure.php
	cake/libs/controller/component.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/error.php
	cake/libs/magic_db.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_behavior_class.ctp
	cake/libs/view/errors/missing_behavior_file.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/bake.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/console/libs/tasks/db_config.test.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/plugin.test.php
	cake/tests/cases/console/libs/tasks/project.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/console/libs/tasks/view.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/media.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/reporter/cake_base_reporter.php
	cake/tests/lib/reporter/cake_cli_reporter.php
	cake/tests/lib/reporter/cake_text_reporter.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/libs/library.php
	cake/tests/test_app/libs/log/test_app_log.php
	cake/tests/test_app/plugins/test_plugin/config/load.php
	cake/tests/test_app/plugins/test_plugin/config/more.load.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
	cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Console/cake.bat
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/test_app/View/Emails/html/custom.ctp
	lib/Cake/Test/test_app/View/Emails/text/custom.ctp
	lib/Cake/TestSuite/templates/header.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
 2011-06-23 12:48:06 -07:00
Mark Story
9e4c367688 Adding Wincache support. Wincache is a fast shared memory 
cache that performs very well on windows platforms.
 2011-06-21 16:02:25 -07:00
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Thomas Ploch
402c4a7a6f Added 'persistent' setting to MemcacheEngine. 
Fixes #1705 when connections are not closed when using i.e. FCGI.
 2011-05-13 23:44:59 +02:00
evilbloodydemon
86b76674d0 PhpDoc fixes 
Signed-off-by: mark_story <mark@mark-story.com>
 2011-04-17 11:23:52 -04:00
AD7six
32df3156a7 consolidate cake_error and cake_developer to simply "cake_dev" 
it's a lot easier for adding new translations to think:
	is it for the end user?
		use 'cake' as the domain
	is it for the developer
		use 'cake_dev' as the domain
	is it for the console
		use 'cake_console' as the domain

also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
 2011-03-20 16:38:31 +01:00
AD7six
2fc8d88916 using the domain cake_error for error messages. 
These are error message for developers
 2011-03-19 17:58:47 +01:00
AD7six
39c7d03319 Merge branch '2.0-class-loading' into 2.0-translations 
Conflicts:
	lib/Cake/Console/Command/Task/ControllerTask.php
	lib/Cake/Console/Command/Task/ProjectTask.php
	lib/Cake/Core/Configure.php
	lib/Cake/View/pages/home.ctp
 2011-03-16 12:29:39 +01:00
Jose Lorenzo Rodriguez
0cd51de827 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-12 23:49:02 -04:30
AD7six
d7f275d705 translation changes in the cache folder 
modified:   lib/Cake/Network/Http/HttpResponse.php
 2011-03-12 19:48:57 +01:00
José Lorenzo Rodríguez
d9c99b5ef6 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/tests/cases/libs/controller_test_case.test.php
	lib/Cake/Controller/ComponentCollection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
	lib/Cake/View/pages/home.ctp
 2011-01-22 01:00:15 -04:30
José Lorenzo Rodríguez
4c0e06c451 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/bootstrap.php
	cake/libs/view/helpers/js.php
	lib/Cake/Model/AclNode.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/bootstrap.php
	lib/Cake/tests/cases/libs/controller/controller.test.php
 2011-01-02 02:00:03 -04:30
José Lorenzo Rodríguez
07e43bb0f8 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/form.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
	cake/tests/test_app/views/posts/scaffold.edit.ctp
	cake/tests/test_app/views/posts/scaffold.form.ctp
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/CakeSession.php
	lib/Cake/Routing/Router.php
	lib/Cake/TestSuite/TestManager.php
	lib/Cake/View/scaffolds/edit.ctp
	lib/Cake/tests/cases/console/shells/bake.test.php
	lib/Cake/tests/cases/libs/cake_log.test.php
	lib/Cake/tests/cases/libs/cake_request.test.php
	lib/Cake/tests/cases/libs/view/helpers/number.test.php
	lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
 2010-12-15 01:13:05 -04:30
José Lorenzo Rodríguez
3f64844de9 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/basics.php
 2010-12-05 23:43:58 -04:30
José Lorenzo Rodríguez
73ad5385eb Moving more classes to the new layout, it is time to bring the debugger up 2010-12-04 02:16:51 -04:30