cakephp2-php8/cake/libs/model/model_behavior.php
Mark Story 4f67f84ff8 Merge branch '1.2' into 1.3-merger
Conflicts:
	app/config/acl.ini.php
	app/config/bootstrap.php
	app/config/core.php
	app/config/database.php.default
	app/config/inflections.php
	app/config/routes.php
	app/config/schema/db_acl.php
	app/config/schema/i18n.php
	app/config/schema/sessions.php
	app/config/sql/db_acl.sql
	app/config/sql/i18n.sql
	app/index.php
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	app/webroot/index.php
	app/webroot/js/vendors.php
	app/webroot/test.php
	cake/LICENSE.txt
	cake/basics.php
	cake/bootstrap.php
	cake/config/config.php
	cake/config/paths.php
	cake/config/unicode/casefolding/0080_00ff.php
	cake/config/unicode/casefolding/0100_017f.php
	cake/config/unicode/casefolding/0180_024F.php
	cake/config/unicode/casefolding/0250_02af.php
	cake/config/unicode/casefolding/0370_03ff.php
	cake/config/unicode/casefolding/0400_04ff.php
	cake/config/unicode/casefolding/0500_052f.php
	cake/config/unicode/casefolding/0530_058f.php
	cake/config/unicode/casefolding/1e00_1eff.php
	cake/config/unicode/casefolding/1f00_1fff.php
	cake/config/unicode/casefolding/2100_214f.php
	cake/config/unicode/casefolding/2150_218f.php
	cake/config/unicode/casefolding/2460_24ff.php
	cake/config/unicode/casefolding/2c00_2c5f.php
	cake/config/unicode/casefolding/2c60_2c7f.php
	cake/config/unicode/casefolding/2c80_2cff.php
	cake/config/unicode/casefolding/ff00_ffef.php
	cake/console/cake
	cake/console/cake.bat
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/api.php
	cake/console/libs/bake.php
	cake/console/libs/console.php
	cake/console/libs/i18n.php
	cake/console/libs/schema.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/tasks/test.php
	cake/console/libs/tasks/view.php
	cake/console/libs/templates/skel/config/bootstrap.php
	cake/console/libs/templates/skel/config/inflections.php
	cake/console/libs/templates/skel/config/sql/sessions.sql
	cake/console/libs/templates/skel/index.php
	cake/console/libs/templates/skel/views/elements/email/html/default.ctp
	cake/console/libs/templates/skel/views/elements/email/text/default.ctp
	cake/console/libs/templates/skel/views/layouts/ajax.ctp
	cake/console/libs/templates/skel/views/layouts/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
	cake/console/libs/templates/skel/webroot/js/vendors.php
	cake/console/libs/templates/skel/webroot/test.php
	cake/console/libs/templates/views/form.ctp
	cake/console/libs/templates/views/index.ctp
	cake/console/libs/testsuite.php
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/app_controller.php
	cake/console/templates/skel/app_helper.php
	cake/console/templates/skel/app_model.php
	cake/console/templates/skel/config/acl.ini.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/config/routes.php
	cake/console/templates/skel/config/schema/db_acl.php
	cake/console/templates/skel/config/schema/db_acl.sql
	cake/console/templates/skel/config/schema/i18n.php
	cake/console/templates/skel/config/schema/i18n.sql
	cake/console/templates/skel/config/schema/sessions.php
	cake/console/templates/skel/config/schema/sessions.sql
	cake/console/templates/skel/controllers/pages_controller.php
	cake/console/templates/skel/views/layouts/flash.ctp
	cake/console/templates/skel/webroot/css.php
	cake/console/templates/skel/webroot/css/cake.generic.css
	cake/console/templates/skel/webroot/index.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cache/apc.php
	cake/libs/cache/file.php
	cake/libs/cache/memcache.php
	cake/libs/cache/xcache.php
	cake/libs/cake_log.php
	cake/libs/cake_session.php
	cake/libs/cake_socket.php
	cake/libs/class_registry.php
	cake/libs/configure.php
	cake/libs/controller/app_controller.php
	cake/libs/controller/component.php
	cake/libs/controller/components/acl.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/cookie.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/components/session.php
	cake/libs/controller/controller.php
	cake/libs/controller/pages_controller.php
	cake/libs/controller/scaffold.php
	cake/libs/debugger.php
	cake/libs/error.php
	cake/libs/file.php
	cake/libs/flay.php
	cake/libs/folder.php
	cake/libs/http_socket.php
	cake/libs/i18n.php
	cake/libs/inflector.php
	cake/libs/l10n.php
	cake/libs/magic_db.php
	cake/libs/model/app_model.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/translate.php
	cake/libs/model/behaviors/tree.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/datasource.php
	cake/libs/model/datasources/dbo/dbo_adodb.php
	cake/libs/model/datasources/dbo/dbo_db2.php
	cake/libs/model/datasources/dbo/dbo_firebird.php
	cake/libs/model/datasources/dbo/dbo_mssql.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/datasources/dbo/dbo_odbc.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/datasources/dbo/dbo_postgres.php
	cake/libs/model/datasources/dbo/dbo_sqlite.php
	cake/libs/model/datasources/dbo/dbo_sybase.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/db_acl.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/multibyte.php
	cake/libs/object.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/sanitize.php
	cake/libs/security.php
	cake/libs/set.php
	cake/libs/string.php
	cake/libs/validation.php
	cake/libs/view/elements/dump.ctp
	cake/libs/view/elements/email/html/default.ctp
	cake/libs/view/elements/email/text/default.ctp
	cake/libs/view/errors/error404.ctp
	cake/libs/view/errors/missing_action.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/helper.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/app_helper.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/number.php
	cake/libs/view/helpers/paginator.php
	cake/libs/view/helpers/rss.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/text.php
	cake/libs/view/helpers/time.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/layouts/ajax.ctp
	cake/libs/view/layouts/default.ctp
	cake/libs/view/layouts/email/html/default.ctp
	cake/libs/view/layouts/email/text/default.ctp
	cake/libs/view/layouts/flash.ctp
	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/theme.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/basics.test.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/schema.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cache/file.test.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/cache/xcache.test.php
	cake/tests/cases/libs/cake_log.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_socket.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/class_registry.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/acl.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/email.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/controller_merge_vars.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/file.test.php
	cake/tests/cases/libs/flay.test.php
	cake/tests/cases/libs/folder.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/l10n.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
	cake/tests/cases/libs/model/behaviors/containable.test.php
	cake/tests/cases/libs/model/behaviors/translate.test.php
	cake/tests/cases/libs/model/behaviors/tree.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.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/dbo_oracle.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/db_acl.test.php
	cake/tests/cases/libs/model/model.test.php
	cake/tests/cases/libs/model/model_behavior.test.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/model/model_integration.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/model/model_validation.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/multibyte.test.php
	cake/tests/cases/libs/object.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/sanitize.test.php
	cake/tests/cases/libs/security.test.php
	cake/tests/cases/libs/set.test.php
	cake/tests/cases/libs/string.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helper.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/number.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
	cake/tests/cases/libs/view/helpers/rss.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
	cake/tests/cases/libs/view/helpers/time.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/account_fixture.php
	cake/tests/fixtures/aco_action_fixture.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/aco_two_fixture.php
	cake/tests/fixtures/advertisement_fixture.php
	cake/tests/fixtures/another_article_fixture.php
	cake/tests/fixtures/apple_fixture.php
	cake/tests/fixtures/aro_fixture.php
	cake/tests/fixtures/aro_two_fixture.php
	cake/tests/fixtures/aros_aco_fixture.php
	cake/tests/fixtures/aros_aco_two_fixture.php
	cake/tests/fixtures/article_featured_fixture.php
	cake/tests/fixtures/article_featureds_tags_fixture.php
	cake/tests/fixtures/article_fixture.php
	cake/tests/fixtures/articles_tag_fixture.php
	cake/tests/fixtures/attachment_fixture.php
	cake/tests/fixtures/auth_user_custom_field_fixture.php
	cake/tests/fixtures/auth_user_fixture.php
	cake/tests/fixtures/author_fixture.php
	cake/tests/fixtures/basket_fixture.php
	cake/tests/fixtures/bid_fixture.php
	cake/tests/fixtures/binary_test_fixture.php
	cake/tests/fixtures/book_fixture.php
	cake/tests/fixtures/cache_test_model_fixture.php
	cake/tests/fixtures/callback_fixture.php
	cake/tests/fixtures/category_fixture.php
	cake/tests/fixtures/category_thread_fixture.php
	cake/tests/fixtures/cd_fixture.php
	cake/tests/fixtures/comment_fixture.php
	cake/tests/fixtures/content_account_fixture.php
	cake/tests/fixtures/content_fixture.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
	cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/data_test_fixture.php
	cake/tests/fixtures/datatype_fixture.php
	cake/tests/fixtures/dependency_fixture.php
	cake/tests/fixtures/device_fixture.php
	cake/tests/fixtures/device_type_category_fixture.php
	cake/tests/fixtures/device_type_fixture.php
	cake/tests/fixtures/document_directory_fixture.php
	cake/tests/fixtures/document_fixture.php
	cake/tests/fixtures/exterior_type_category_fixture.php
	cake/tests/fixtures/feature_set_fixture.php
	cake/tests/fixtures/featured_fixture.php
	cake/tests/fixtures/film_file_fixture.php
	cake/tests/fixtures/flag_tree_fixture.php
	cake/tests/fixtures/fruit_fixture.php
	cake/tests/fixtures/fruits_uuid_tag_fixture.php
	cake/tests/fixtures/home_fixture.php
	cake/tests/fixtures/image_fixture.php
	cake/tests/fixtures/item_fixture.php
	cake/tests/fixtures/items_portfolio_fixture.php
	cake/tests/fixtures/join_a_b_fixture.php
	cake/tests/fixtures/join_a_c_fixture.php
	cake/tests/fixtures/join_a_fixture.php
	cake/tests/fixtures/join_b_fixture.php
	cake/tests/fixtures/join_c_fixture.php
	cake/tests/fixtures/join_thing_fixture.php
	cake/tests/fixtures/message_fixture.php
	cake/tests/fixtures/my_categories_my_products_fixture.php
	cake/tests/fixtures/my_categories_my_users_fixture.php
	cake/tests/fixtures/my_category_fixture.php
	cake/tests/fixtures/my_product_fixture.php
	cake/tests/fixtures/my_user_fixture.php
	cake/tests/fixtures/node_fixture.php
	cake/tests/fixtures/number_tree_fixture.php
	cake/tests/fixtures/number_tree_two_fixture.php
	cake/tests/fixtures/numeric_article_fixture.php
	cake/tests/fixtures/overall_favorite_fixture.php
	cake/tests/fixtures/person_fixture.php
	cake/tests/fixtures/portfolio_fixture.php
	cake/tests/fixtures/post_fixture.php
	cake/tests/fixtures/posts_tag_fixture.php
	cake/tests/fixtures/primary_model_fixture.php
	cake/tests/fixtures/product_fixture.php
	cake/tests/fixtures/project_fixture.php
	cake/tests/fixtures/sample_fixture.php
	cake/tests/fixtures/secondary_model_fixture.php
	cake/tests/fixtures/session_fixture.php
	cake/tests/fixtures/something_else_fixture.php
	cake/tests/fixtures/something_fixture.php
	cake/tests/fixtures/stories_tag_fixture.php
	cake/tests/fixtures/story_fixture.php
	cake/tests/fixtures/syfile_fixture.php
	cake/tests/fixtures/tag_fixture.php
	cake/tests/fixtures/test_plugin_article_fixture.php
	cake/tests/fixtures/test_plugin_comment_fixture.php
	cake/tests/fixtures/the_paper_monkies_fixture.php
	cake/tests/fixtures/thread_fixture.php
	cake/tests/fixtures/translate_article_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/fixtures/translate_table_fixture.php
	cake/tests/fixtures/translated_article_fixture.php
	cake/tests/fixtures/translated_item_fixture.php
	cake/tests/fixtures/unconventional_tree_fixture.php
	cake/tests/fixtures/underscore_field_fixture.php
	cake/tests/fixtures/user_fixture.php
	cake/tests/fixtures/uuid_fixture.php
	cake/tests/fixtures/uuid_tag_fixture.php
	cake/tests/fixtures/uuid_tree_fixture.php
	cake/tests/fixtures/uuiditem_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
	cake/tests/fixtures/uuidportfolio_fixture.php
	cake/tests/groups/acl.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/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_reporter.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_fixture.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/cli_reporter.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/templates/footer.php
	cake/tests/lib/templates/header.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/lib/xdebug.php
	cake/tests/test_app/config/acl.ini.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/controllers/tests_apps_posts_controller.php
	cake/tests/test_app/models/behaviors/persister_one_behavior.php
	cake/tests/test_app/models/behaviors/persister_two_behavior.php
	cake/tests/test_app/models/comment.php
	cake/tests/test_app/models/persister_one.php
	cake/tests/test_app/models/persister_two.php
	cake/tests/test_app/models/post.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/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.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/shells/example.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/plugins/test_plugin_two/vendors/shells/example.php
	cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.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/html/default.ctp
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/elements/email/text/wide.ctp
	cake/tests/test_app/views/layouts/ajax.ctp
	cake/tests/test_app/views/layouts/ajax2.ctp
	cake/tests/test_app/views/layouts/cache_layout.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/layouts/email/html/default.ctp
	cake/tests/test_app/views/layouts/email/html/thin.ctp
	cake/tests/test_app/views/layouts/email/text/default.ctp
	cake/tests/test_app/views/layouts/flash.ctp
	cake/tests/test_app/views/layouts/multi_cache.ctp
	cake/tests/test_app/views/posts/sequencial_nocache.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	index.php
2010-01-26 17:54:34 -05:00

534 lines
No EOL
15 KiB
PHP

<?php
/**
* Model behaviors base class.
*
* Adds methods and automagic functionality to Cake Models.
*
* PHP versions 4 and 5
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
* @package cake
* @subpackage cake.cake.libs.model
* @since CakePHP(tm) v 1.2.0.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
/**
* Model behavior base class.
*
* Defines the Behavior interface, and contains common model interaction functionality.
*
* @package cake
* @subpackage cake.cake.libs.model
*/
class ModelBehavior extends Object {
/**
* Contains configuration settings for use with individual model objects. This
* is used because if multiple models use this Behavior, each will use the same
* object instance. Individual model settings should be stored as an
* associative array, keyed off of the model name.
*
* @var array
* @access public
* @see Model::$alias
*/
var $settings = array();
/**
* Allows the mapping of preg-compatible regular expressions to public or
* private methods in this class, where the array key is a /-delimited regular
* expression, and the value is a class method. Similar to the functionality of
* the findBy* / findAllBy* magic methods.
*
* @var array
* @access public
*/
var $mapMethods = array();
/**
* Setup this behavior with the specified configuration settings.
*
* @param object $model Model using this behavior
* @param array $config Configuration settings for $model
* @access public
*/
function setup(&$model, $config = array()) { }
/**
* Clean up any initialization this behavior has done on a model. Called when a behavior is dynamically
* detached from a model using Model::detach().
*
* @param object $model Model using this behavior
* @access public
* @see BehaviorCollection::detach()
*/
function cleanup(&$model) {
if (isset($this->settings[$model->alias])) {
unset($this->settings[$model->alias]);
}
}
/**
* Before find callback
*
* @param object $model Model using this behavior
* @param array $queryData Data used to execute this query, i.e. conditions, order, etc.
* @return boolean True if the operation should continue, false if it should abort
* @access public
*/
function beforeFind(&$model, $query) { }
/**
* After find callback. Can be used to modify any results returned by find and findAll.
*
* @param object $model Model using this behavior
* @param mixed $results The results of the find operation
* @param boolean $primary Whether this model is being queried directly (vs. being queried as an association)
* @return mixed Result of the find operation
* @access public
*/
function afterFind(&$model, $results, $primary) { }
/**
* Before validate callback
*
* @param object $model Model using this behavior
* @return boolean True if validate operation should continue, false to abort
* @access public
*/
function beforeValidate(&$model) { }
/**
* Before save callback
*
* @param object $model Model using this behavior
* @return boolean True if the operation should continue, false if it should abort
* @access public
*/
function beforeSave(&$model) { }
/**
* After save callback
*
* @param object $model Model using this behavior
* @param boolean $created True if this save created a new record
* @access public
*/
function afterSave(&$model, $created) { }
/**
* Before delete callback
*
* @param object $model Model using this behavior
* @param boolean $cascade If true records that depend on this record will also be deleted
* @return boolean True if the operation should continue, false if it should abort
* @access public
*/
function beforeDelete(&$model, $cascade = true) { }
/**
* After delete callback
*
* @param object $model Model using this behavior
* @access public
*/
function afterDelete(&$model) { }
/**
* DataSource error callback
*
* @param object $model Model using this behavior
* @param string $error Error generated in DataSource
* @access public
*/
function onError(&$model, $error) { }
/**
* Overrides Object::dispatchMethod to account for PHP4's broken reference support
*
* @see Object::dispatchMethod
* @access public
* @return mixed
*/
function dispatchMethod(&$model, $method, $params = array()) {
if (empty($params)) {
return $this->{$method}($model);
}
$params = array_values($params);
switch (count($params)) {
case 1:
return $this->{$method}($model, $params[0]);
case 2:
return $this->{$method}($model, $params[0], $params[1]);
case 3:
return $this->{$method}($model, $params[0], $params[1], $params[2]);
case 4:
return $this->{$method}($model, $params[0], $params[1], $params[2], $params[3]);
case 5:
return $this->{$method}($model, $params[0], $params[1], $params[2], $params[3], $params[4]);
default:
array_unshift($params, $model);
return call_user_func_array(array(&$this, $method), $params);
break;
}
}
/**
* If $model's whitelist property is non-empty, $field will be added to it.
* Note: this method should *only* be used in beforeValidate or beforeSave to ensure
* that it only modifies the whitelist for the current save operation. Also make sure
* you explicitly set the value of the field which you are allowing.
*
* @param object $model Model using this behavior
* @param string $field Field to be added to $model's whitelist
* @access protected
* @return void
*/
function _addToWhitelist(&$model, $field) {
if (is_array($field)) {
foreach ($field as $f) {
$this->_addToWhitelist($model, $f);
}
return;
}
if (!empty($model->whitelist) && !in_array($field, $model->whitelist)) {
$model->whitelist[] = $field;
}
}
}
/**
* Model behavior collection class.
*
* Defines the Behavior interface, and contains common model interaction functionality.
*
* @package cake
* @subpackage cake.cake.libs.model
*/
class BehaviorCollection extends Object {
/**
* Stores a reference to the attached name
*
* @var string
* @access public
*/
var $modelName = null;
/**
* Lists the currently-attached behavior objects
*
* @var array
* @access private
*/
var $_attached = array();
/**
* Lists the currently-attached behavior objects which are disabled
*
* @var array
* @access private
*/
var $_disabled = array();
/**
* Keeps a list of all methods of attached behaviors
*
* @var array
*/
var $__methods = array();
/**
* Keeps a list of all methods which have been mapped with regular expressions
*
* @var array
*/
var $__mappedMethods = array();
/**
* Attaches a model object and loads a list of behaviors
*
* @access public
* @return void
*/
function init($modelName, $behaviors = array()) {
$this->modelName = $modelName;
if (!empty($behaviors)) {
foreach (Set::normalize($behaviors) as $behavior => $config) {
$this->attach($behavior, $config);
}
}
}
/**
* Attaches a behavior to a model
*
* @param string $behavior CamelCased name of the behavior to load
* @param array $config Behavior configuration parameters
* @return boolean True on success, false on failure
* @access public
*/
function attach($behavior, $config = array()) {
list($plugin, $name) = pluginSplit($behavior);
$class = $name . 'Behavior';
if (!App::import('Behavior', $behavior)) {
$this->cakeError('missingBehaviorFile', array(array(
'behavior' => $behavior,
'file' => Inflector::underscore($behavior) . '.php',
'code' => 500,
'base' => '/'
)));
return false;
}
if (!class_exists($class)) {
$this->cakeError('missingBehaviorClass', array(array(
'behavior' => $class,
'file' => Inflector::underscore($class) . '.php',
'code' => 500,
'base' => '/'
)));
return false;
}
if (!isset($this->{$name})) {
if (ClassRegistry::isKeySet($class)) {
if (PHP5) {
$this->{$name} = ClassRegistry::getObject($class);
} else {
$this->{$name} =& ClassRegistry::getObject($class);
}
} else {
if (PHP5) {
$this->{$name} = new $class;
} else {
$this->{$name} =& new $class;
}
ClassRegistry::addObject($class, $this->{$name});
if (!empty($plugin)) {
ClassRegistry::addObject($plugin.'.'.$class, $this->{$name});
}
}
} elseif (isset($this->{$name}->settings) && isset($this->{$name}->settings[$this->modelName])) {
if ($config !== null && $config !== false) {
$config = array_merge($this->{$name}->settings[$this->modelName], $config);
} else {
$config = array();
}
}
if (empty($config)) {
$config = array();
}
$this->{$name}->setup(ClassRegistry::getObject($this->modelName), $config);
foreach ($this->{$name}->mapMethods as $method => $alias) {
$this->__mappedMethods[$method] = array($alias, $name);
}
$methods = get_class_methods($this->{$name});
$parentMethods = array_flip(get_class_methods('ModelBehavior'));
$callbacks = array(
'setup', 'cleanup', 'beforeFind', 'afterFind', 'beforeSave', 'afterSave',
'beforeDelete', 'afterDelete', 'afterError'
);
foreach ($methods as $m) {
if (!isset($parentMethods[$m])) {
$methodAllowed = (
$m[0] != '_' && !array_key_exists($m, $this->__methods) &&
!in_array($m, $callbacks)
);
if ($methodAllowed) {
$this->__methods[$m] = array($m, $name);
}
}
}
if (!in_array($name, $this->_attached)) {
$this->_attached[] = $name;
}
if (in_array($name, $this->_disabled) && !(isset($config['enabled']) && $config['enabled'] === false)) {
$this->enable($name);
} elseif (isset($config['enabled']) && $config['enabled'] === false) {
$this->disable($name);
}
return true;
}
/**
* Detaches a behavior from a model
*
* @param string $name CamelCased name of the behavior to unload
* @return void
* @access public
*/
function detach($name) {
if (isset($this->{$name})) {
$this->{$name}->cleanup(ClassRegistry::getObject($this->modelName));
unset($this->{$name});
}
foreach ($this->__methods as $m => $callback) {
if (is_array($callback) && $callback[1] == $name) {
unset($this->__methods[$m]);
}
}
$this->_attached = array_values(array_diff($this->_attached, (array)$name));
}
/**
* Enables callbacks on a behavior or array of behaviors
*
* @param mixed $name CamelCased name of the behavior(s) to enable (string or array)
* @return void
* @access public
*/
function enable($name) {
$this->_disabled = array_diff($this->_disabled, (array)$name);
}
/**
* Disables callbacks on a behavior or array of behaviors. Public behavior methods are still
* callable as normal.
*
* @param mixed $name CamelCased name of the behavior(s) to disable (string or array)
* @return void
* @access public
*/
function disable($name) {
foreach ((array)$name as $behavior) {
if (in_array($behavior, $this->_attached) && !in_array($behavior, $this->_disabled)) {
$this->_disabled[] = $behavior;
}
}
}
/**
* Gets the list of currently-enabled behaviors, or, the current status of a single behavior
*
* @param string $name Optional. The name of the behavior to check the status of. If omitted,
* returns an array of currently-enabled behaviors
* @return mixed If $name is specified, returns the boolean status of the corresponding behavior.
* Otherwise, returns an array of all enabled behaviors.
* @access public
*/
function enabled($name = null) {
if (!empty($name)) {
return (in_array($name, $this->_attached) && !in_array($name, $this->_disabled));
}
return array_diff($this->_attached, $this->_disabled);
}
/**
* Dispatches a behavior method
*
* @return array All methods for all behaviors attached to this object
* @access public
*/
function dispatchMethod(&$model, $method, $params = array(), $strict = false) {
$methods = array_keys($this->__methods);
foreach ($methods as $key => $value) {
$methods[$key] = strtolower($value);
}
$method = strtolower($method);
$check = array_flip($methods);
$found = isset($check[$method]);
$call = null;
if ($strict && !$found) {
trigger_error(sprintf(__("BehaviorCollection::dispatchMethod() - Method %s not found in any attached behavior", true), $method), E_USER_WARNING);
return null;
} elseif ($found) {
$methods = array_combine($methods, array_values($this->__methods));
$call = $methods[$method];
} else {
$count = count($this->__mappedMethods);
$mapped = array_keys($this->__mappedMethods);
for ($i = 0; $i < $count; $i++) {
if (preg_match($mapped[$i] . 'i', $method)) {
$call = $this->__mappedMethods[$mapped[$i]];
array_unshift($params, $method);
break;
}
}
}
if (!empty($call)) {
return $this->{$call[1]}->dispatchMethod($model, $call[0], $params);
}
return array('unhandled');
}
/**
* Dispatches a behavior callback on all attached behavior objects
*
* @param model $model
* @param string $callback
* @param array $params
* @param array $options
* @return mixed
* @access public
*/
function trigger(&$model, $callback, $params = array(), $options = array()) {
if (empty($this->_attached)) {
return true;
}
$_params = $params;
$options = array_merge(array('break' => false, 'breakOn' => array(null, false), 'modParams' => false), $options);
$count = count($this->_attached);
for ($i = 0; $i < $count; $i++) {
$name = $this->_attached[$i];
if (in_array($name, $this->_disabled)) {
continue;
}
$result = $this->{$name}->dispatchMethod($model, $callback, $params);
if ($options['break'] && ($result === $options['breakOn'] || (is_array($options['breakOn']) && in_array($result, $options['breakOn'], true)))) {
return $result;
} elseif ($options['modParams'] && is_array($result)) {
$params[0] = $result;
}
}
if ($options['modParams'] && isset($params[0])) {
return $params[0];
}
return true;
}
/**
* Gets the method list for attached behaviors, i.e. all public, non-callback methods
*
* @return array All public methods for all behaviors attached to this collection
* @access public
*/
function methods() {
return $this->__methods;
}
/**
* Gets the list of attached behaviors, or, whether the given behavior is attached
*
* @param string $name Optional. The name of the behavior to check the status of. If omitted,
* returns an array of currently-attached behaviors
* @return mixed If $name is specified, returns the boolean status of the corresponding behavior.
* Otherwise, returns an array of all attached behaviors.
* @access public
*/
function attached($name = null) {
if (!empty($name)) {
return (in_array($name, $this->_attached));
}
return $this->_attached;
}
}
?>