Mark Story
827c65a767
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-26 17:57:25 -05:00
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
Mark Story
66a8910810
Fixing cakephp domain name.
2010-01-26 17:15:15 -05:00
Mark Story
cdd87849cc
Fixing @link tags to ease merging.
2010-01-26 17:03:03 -05:00
Mark Story
527eec1a54
Fixing doc tags to make merge easier.
2010-01-26 16:51:53 -05:00
renan.saddam
a318ba43fd
Enabling code coverage to run on 'All tests' group.
2010-01-26 17:22:07 -02:00
Mark Story
fc304056a3
Removing Session deletion of nonce token on blackhole. Fixes possible CSRF risk from multiple submissions of the same invalid data. Refs #214
2010-01-26 13:59:26 -05:00
renan.saddam
81414b7175
Enabling group code coverage on plugins outside APP/plugins path.
2010-01-26 15:00:19 -02:00
Mark Story
c195d654b3
Fixing TranslateBehavior test to run in php4.
2010-01-26 11:00:37 -05:00
renan.saddam
3e4a9631da
Fixing notice due by using a non-existent variable.
2010-01-26 12:14:47 -02:00
José Lorenzo RodrÃguez
f84a184360
Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
...
* '1.3' of git@github.com:cakephp/cakephp1x:
Removing optional group flag for routed parameters. Fixes issues with trailing empty route parameters. Tests added for correct parsing of these routes. Fixes #252
Adding support for CURRENT_TIMESTAMP to all dbo's.
Adding tests for CURRENT_TIMESTAMP to DboSource.
2010-01-25 14:13:13 -04:30
José Lorenzo RodrÃguez
b24b43b848
Fixing docblock
2010-01-25 14:12:41 -04:30
Mark Story
38eac37bb1
Removing optional group flag for routed parameters. Fixes issues with trailing empty route parameters. Tests added for correct parsing of these routes. Fixes #252
2010-01-25 12:49:12 -05:00
Mark Story
5fcbc33a75
Adding tests for CURRENT_TIMESTAMP to DboSource.
2010-01-25 12:25:14 -05:00
Mark Story
98749a5a2b
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
...
Conflicts:
cake/libs/folder.php
2010-01-25 11:18:44 -05:00
José Lorenzo RodrÃguez
03200440ed
Fixing TranslateBehavior and $tablePrefix. Closes #168
2010-01-24 18:27:08 -04:30
Phally
3c265283e7
Added support for Message-ID headers.
2010-01-24 23:29:53 +01:00
Mark Story
5d35fd8d38
Fixing issues in DboSource::defaultConditions() and DboSource::conditions() where doubly deleting a record from the beforeDelete and delete() could create incorrect conditions that would delete all records in a table. Fixes #250
2010-01-22 10:30:22 -05:00
Phally
2e46504d05
Fixed failing test case due to changes in 1.3.
2010-01-21 23:07:42 +01:00
José Lorenzo RodrÃguez
e77ed92646
Merge branch '1.3-cache' into 1.3
...
* 1.3-cache:
Removing repeated checks, as they've been refactored into Cache::increment() and Cache::decrement().
Removing php5 visibility keywords.
Fixing various errors related to Cache::increment() and Cache::decrement().
Removing test ignore
Adding atomic increment and decrement methods to cache engines, closes #234
2010-01-21 14:57:07 -04:30
Mark Story
513db9a72a
Removing repeated checks, as they've been refactored into Cache::increment() and Cache::decrement().
...
Adding skipIf()'s to ApcEngineTest in case apc_inc, and apc_dec are not available.
2010-01-21 14:14:26 -05:00
Mark Story
ff7e906ba2
Removing php5 visibility keywords.
...
Fixing increment count tests in xcache test.
2010-01-21 14:06:18 -05:00
Mark Story
47c7387548
Fixing various errors related to Cache::increment() and Cache::decrement().
...
Removing php5 only keywords from test cases.
Updating memcache tests, to correctly skip multiple server test when multiple memcached servers cannot be found.
2010-01-21 13:57:42 -05:00
Mark Story
e150db2a45
Removing test ignore
2010-01-21 13:24:22 -05:00
Mark Story
2915493049
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-21 12:00:04 -05:00
Mark Story
c5a5d1dfe6
Making Session.model the required setting and not Session.table. Session.table can still be used to set the table name used when configuring sessions, but the default value is cake_session as before. Fixes #223
2010-01-21 11:59:49 -05:00
José Lorenzo RodrÃguez
dff7e17fa2
Adding atomic increment and decrement methods to cache engines, closes #234
2010-01-21 12:11:44 -04:30
ADmad
a8040506b0
Fixing spacing between button tag attributes. Fixes #241
2010-01-21 22:03:03 +05:30
Mark Story
913450daef
Additional tests for virtualFields and fixing issues with index 0 being removed. Fixes #208
2010-01-21 10:35:20 -05:00
Phally
984dc50f37
Merge commit 'upstream/1.3' into 1.3-email_component
2010-01-21 00:05:03 +01:00
ADmad
570c9e5304
Cleaning up commented and unneeded test cases and moving tests to more appropriate file
2010-01-21 01:42:54 +05:30
Mark Story
317463096a
Refactoring tests in l10n that use object properties.
2010-01-20 14:53:57 -05:00
Mark Story
ae4a31f070
Making DEFAULT_LANGUAGE also set $language var which sets Config.language to a correct value. Fixes #228
2010-01-20 14:33:37 -05:00
renan.saddam
39dd15d3f6
Removing the ´with´ key from otherFields array, also fixing the page title. Tests added.
2010-01-19 14:05:29 -02:00
Mark Story
e1b0c41254
Making Model::isVirtualField() and Model::getVirtualField() work with both Model.field
as field
. This fixes a number of issues in conditions, and fields arrays when model aliases are used. Fixes #208 and #220
2010-01-19 09:22:13 -05:00
Mark Story
9f8e0e163e
Removing getTests included by accident.
2010-01-18 21:59:18 -05:00
Mark Story
9b3a2fd658
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-18 21:57:46 -05:00
Mark Story
080e34718d
Minor refactor, and adding tests from previous commit. Fixes #208
2010-01-18 21:57:03 -05:00
José Lorenzo RodrÃguez
cb4a1f07e5
Fixing issue with persistModels and plugin models, closes #192 and #198
2010-01-18 13:13:10 -04:30
Mark Story
06ba7ac828
Adding omitted default route, and test cases to test its functionality. Fixes #212
2010-01-18 10:05:23 -05:00
Juan Basso
473e07a674
Putting __() in strings that missing internationalization.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-18 01:06:25 -05:00
Juan Basso
0ac99eddb5
Replacing "echo sprintf" by "printf" where possible. Fixes #209 .
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-18 00:56:22 -05:00
Mark Story
5203397a6a
Adding error expectation to model_write test. Models using useTable = false, will still issue count queries to their datasources when exists() is called.
2010-01-16 20:24:27 -05:00
Mark Story
3be28fc749
Fixing errors in CakeTestCase::testAction tests case caused by changes in test suite not always forcing an output parameter.
2010-01-16 20:18:20 -05:00
Mark Story
0e09fee3b1
Correcting timehelper tests to use correct timestamp for indicated times. Making timezone output more resilient.
2010-01-16 20:14:57 -05:00
Mark Story
f1276ce337
Fixing several issues in the CodeCoverageManager test case.
2010-01-16 20:14:16 -05:00
Mark Story
c4ef429004
Changing require to require_once to make tests less order dependent.
2010-01-16 19:41:52 -05:00
Mark Story
34fed29d05
Renaming session test case.
...
Adding missing doc block to inflector test case.
Updating Set::map reverse test to reflect changes in Model.
Removing Inflector from lib group as the reset test breaks many other tests.
Adding a table property to the session fixture.
2010-01-16 19:19:12 -05:00
Mark Story
1acc4c879a
Removing debug() from scaffold test.
2010-01-16 18:15:38 -05:00
José Lorenzo RodrÃguez
1910a7f7ee
Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
...
* '1.3' of git@github.com:cakephp/cakephp1x:
Removing gettests from jsHelper test case.
2010-01-15 19:04:13 -04:30
José Lorenzo RodrÃguez
3bd4cc07a6
Fixes to make TimeHelper and test cases more compatible with PHP 4
2010-01-15 17:48:41 -04:30
Mark Story
71254f3d5e
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-15 17:17:26 -05:00
Mark Story
476ef19fff
Removing gettests from jsHelper test case.
2010-01-15 17:16:51 -05:00
ADmad
4c0a6d952f
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-16 03:34:14 +05:30
ADmad
2441849fa0
Replacing constant CIPHER_SEED with Configure class variable 'Security.cipher_seed' and renaming Security class method 'checkSessionKey' to 'checkSecurityKeys'
2010-01-16 03:26:26 +05:30
Mark Story
4f5ce7f94c
Adding additional plugin 'shortcut' dispatching tests.
2010-01-15 16:18:19 -05:00
Mark Story
1a8c3fd405
Fixing infinite loops caused by stale caches.
2010-01-15 16:17:34 -05:00
Mark Story
c20aba6b9c
Merge branch 'merger' into 1.3
2010-01-15 13:27:19 -05:00
Mark Story
f11068b831
Trimming trailing whitespace from files. Refs #201
2010-01-15 13:26:47 -05:00
Mark Story
09ad7418f5
Merge remote branch 'origin/1.2' into merger
...
Conflicts:
cake/console/templates/skel/config/inflections.php
cake/libs/model/cake_schema.php
cake/libs/model/model.php
2010-01-15 11:51:58 -05:00
Mark Story
7088afbb88
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-15 00:11:33 -05:00
Mark Story
34c4af549c
Adding missing reference operators for php4 compatibility.
2010-01-15 00:09:59 -05:00
Mark Story
f1a0690415
Fixing issues in JsHelper with PHP4 compatibility. Seems passing arrays by reference doesn't work very well.
2010-01-15 00:02:24 -05:00
Mark Story
276d183bdd
Adding conditional to php5 only function use.
2010-01-14 23:40:18 -05:00
Mark Story
371ac3971a
Fixing php4 compatibility in model_read test.
2010-01-14 23:38:24 -05:00
Mark Story
3a38e0869f
Fixing php4 issues in ErrorHandler and ErrorHandler testcase.
2010-01-14 23:17:24 -05:00
Mark Story
036d7e6e13
Updating helper syntax.
2010-01-14 23:07:15 -05:00
Mark Story
d4d9ed7bfe
Fixing test cases and php4 compatibility in Debugger.
2010-01-14 23:06:48 -05:00
Mark Story
5212406ea7
Making xml data test php5 only as Xml::compare() is non-functional in php4
2010-01-14 22:48:19 -05:00
Mark Story
5d280ea977
Making CodeCoverageManager and CakeSession tests run in php4. Removing test case for removed method.
2010-01-14 22:47:49 -05:00
Mark Story
2093f05ce7
Fixing php4 compatibility issues in CakeLog.
2010-01-14 22:33:14 -05:00
Mark Story
8f2a4a1e0e
Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2
2010-01-14 20:28:00 -05:00
Mark Story
5c47d8dd7a
Trimming trailing whitespace from files. Refs #201
2010-01-14 20:15:54 -05:00
Joël Perras
259b59cae1
Adding optional $reset parameter to Inflector::rules(). Fixes #91 .
...
Inflector::rules() now has an optional 3rd parameter, $reset, which can
be set to true if you desire to remove the default inflections defined
in Inflector.
Note that the reset will only affect those inflection types which you
have explicitly re-defined in the $rules parameter.
2010-01-14 18:18:55 -05:00
Joël Perras
eb7e10db50
Updating Inflector::slug() handling of $map argument. Fixes #18 .
...
When passing a $map to Inflector::slug(), the $map values will now
overwrite any default mappings that Inflector::slug defines.
Modified pre-existing test-case for Inflector::slug() when using a $map.
2010-01-14 17:51:14 -05:00
Joël Perras
adb0c809a0
Refactoring Model::exists() to be independent of Model::$useTable. Fixes #199 .
...
Model::exists() now makes no check whatsoever on the value of
Model::$useTable. This means that, as with a database-backed dbo,
Model::exists() will call Model::find('count') (which in turn calls
DataSource::read()) to determine if the record identified by Model::$id
already exists in the datasource.
2010-01-14 16:47:08 -05:00
José Lorenzo RodrÃguez
09b466f8aa
Fixing whitespace and removig calls to Helper::output() introduced by error
2010-01-14 15:38:48 -04:30
José Lorenzo RodrÃguez
0b3758dc91
Bug fix in I18n
...
Changing calls from date to strftime in TimeHelper
Implementing TimeHelper::converSpecifiers() to conver format strings to be windows safe and I18n friendly
Implementing TimeHelper::i18nFormat() to format dates with preferred locale date format
Changing TimeHelper::format() to handle inversion of first two parameters, while being backwards compatible. If called with the first parameter as a time string it will call TimeHelper::i18nFormat()
2010-01-14 14:11:57 -04:30
José Lorenzo RodrÃguez
a980f72364
Refactoring I18n::translate() to return time format string or arrays when category is LC_TIME
...
Tests added
2010-01-14 09:54:45 -04:30
José Lorenzo RodrÃguez
589972d581
Merge branch '1.3' into github-i18n
...
* 1.3: (137 commits)
Updating tests to reflect SessionHelper's loss of magic inclusion.
Removing SessionHelper's magical inclusion into the helpers array. Use of SessionHelper must now be explicitly done. Tests updated.
Fixing merge var test case for non magic session component.
Fixing Pagescontroller test and removal of pageTitle from controller.
Fixing component and controller test cases to work with less magical session component.
Removing the magical addition of SessionComponent to components array. This makes components more declarative, and removes magic that cannot be undone by the end developer.
Fixing failing tests due to deleted assets.
Removing use of subclass method 'fullTableName()' in Datasource superclass. Fixes #100 .
Updating CakeTestSuiteDispatcher parsing of .
Adding missing </p> to Html test reporter template.
Updating css file in skel dir.
Fixing alignment issues in tables.
Removing orphaned method.
Adding 'id' attribute to hidden field generated for multiple select and multiple checkboxes. Fixes issue where invalid markup was generated in case to multiple checkboxes
Adding php5 check to avoid errors when using __get() or __isset() methods in models
Fixing include in test of CodeCoverageManager. Fixes #196
Fixing var name when not have SimpleTest or XDebug installed.
Moving skel/config/sql to skel/config/schema
Fixing output of 'Actions' in bake templates. Now outputs a __() call.
Updating scaffolds to match new bake design.
...
2010-01-14 08:34:03 -04:30
Mark Story
1980a46b46
Updating tests to reflect SessionHelper's loss of magic inclusion.
2010-01-14 00:09:14 -05:00
Mark Story
a56bc5585c
Removing SessionHelper's magical inclusion into the helpers array. Use of SessionHelper must now be explicitly done. Tests updated.
2010-01-13 23:55:09 -05:00
Mark Story
a85da63956
Fixing merge var test case for non magic session component.
2010-01-13 23:49:11 -05:00
Mark Story
32832f4810
Fixing Pagescontroller test and removal of pageTitle from controller.
2010-01-13 23:49:11 -05:00
Mark Story
540e81b1b0
Fixing component and controller test cases to work with less magical session component.
2010-01-13 23:49:11 -05:00
Mark Story
eb2c34afa0
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-13 23:47:59 -05:00
Mark Story
67b69b3106
Fixing failing tests due to deleted assets.
2010-01-13 23:47:31 -05:00
Joël Perras
15b8a3ec71
Updating copyright date on all files.
2010-01-13 23:47:14 -05:00
Joël Perras
88a09cfbb4
Updating CakeTestSuiteDispatcher parsing of .
...
Better handling of cases where dirname() of PHP_SELF returns only '/'.
2010-01-13 23:19:10 -05:00
Joël Perras
ff3aefe93a
Adding missing </p> to Html test reporter template.
2010-01-13 23:19:09 -05:00
ADmad
848dc518ab
Adding 'id' attribute to hidden field generated for multiple select and multiple checkboxes. Fixes issue where invalid markup was generated in case to multiple checkboxes
2010-01-14 04:13:39 +05:30
Juan Basso
d8257518de
Fixing include in test of CodeCoverageManager. Fixes #196
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-13 09:38:26 -05:00
Juan Basso
1c542b6ea5
Fixing var name when not have SimpleTest or XDebug installed.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-13 09:35:58 -05:00
José Lorenzo RodrÃguez
4e3aedecde
Fixing persitModel and plugin Behaviors. Closes #192
2010-01-13 09:53:00 -04:30
Mark Story
84840c7b04
Fixing issues with magic input() type detection and adding/updating tests.
2010-01-12 23:27:17 -05:00
Mark Story
d8e7aa929c
Merge branch '1.3-misc' into 1.3
2010-01-12 17:18:14 -05:00
Mark Story
8e22e8cbea
Merge branch '1.3-test-suite' into 1.3-misc
2010-01-12 09:31:07 -05:00
Mark Story
a0c3c4b803
Updating AuthComponent::startup() so that being redirected to loginAction with no Auth.redirect value in the session and a non empty loginRedirect defined, the Auth.redirect value is not overwritten. This prevents redirection to already accessible pages. Test cases updated.
...
Fixes #173
2010-01-11 23:54:06 -05:00
Mark Story
0803e2a5a6
Moving CLI code coverage generation into the CliReporter.
2010-01-11 18:04:08 -05:00
Mark Story
07b43be125
Making CLI case code coverage reports include text.
2010-01-11 18:00:45 -05:00
José Lorenzo RodrÃguez
04562982b2
Fixing doc block
2010-01-11 15:34:16 -04:30
José Lorenzo RodrÃguez
7e9fc9f705
Test case for date format definition using a LC_TIME locale file
2010-01-11 15:19:57 -04:30
José Lorenzo RodrÃguez
50f58da60d
Continuing work on locale definition file parser
2010-01-11 15:12:24 -04:30
José Lorenzo RodrÃguez
8bc4f0336e
Beginings of a parser of locale definition file
2010-01-11 15:09:42 -04:30
José Lorenzo RodrÃguez
aa9258cbd1
Adding test for DboSource::group() and virtual fields
...
Closes #184
2010-01-11 12:22:59 -04:30
Phally
bbb105fc8c
Added virtual field support for GROUP BY.
2010-01-11 11:46:59 -04:30
Mark Story
4ada5b7eea
Fixing notice errors caused by incorrect datatyping in php4.
2010-01-11 09:44:51 -05:00
Mark Story
84e70c1db1
Adding linebreak for text/cli output situations.
2010-01-10 15:56:51 -05:00
Mark Story
489958ea48
CakeTextReporter now outputs code coverage.
2010-01-10 15:56:24 -05:00
Mark Story
9989327b5b
Fixing constructor of CakeCliReporter to match CakeBaseReporter.
2010-01-10 15:55:49 -05:00
Mark Story
02dbbcdfc6
Fixing CliReporter class name as well as making cli/text output the default if the reporter is unknown.
2010-01-10 15:45:41 -05:00
Mark Story
e7e1a9b15c
Further refactoring of code coverage manager.
2010-01-10 15:42:30 -05:00
Mark Story
5a88aaf909
Refactoring loops in CodeCoverageManager
2010-01-10 15:28:29 -05:00
Mark Story
645807211b
Adding clear to CodeCoverageManager.
2010-01-10 13:39:41 -05:00
Mark Story
d7164c416e
Adding code coverage toggling to CakeBaseReporter.
...
Updating CodeCoverageManager method use in CakeTestSuiteDispatcher.
2010-01-10 13:24:41 -05:00
Mark Story
da26124add
Renaming CodeCoverageManager::start() to init().
...
Adding a start(), stop(), and clear() methods to CodeCoverageManager.
Making CakeBaseReporter toggle code coverage on and off as needed.
Updating test case for CodeCoverageManager.
2010-01-10 13:23:37 -05:00
Mark Story
b83f3d37c8
Removing unused method.
2010-01-10 13:06:11 -05:00
Mark Story
3dad64c9c0
Moving buffer start in CakeHtmlReporter to fix errors when displaying menus.
...
Adding paintDocumentStart() to CakeTextReporter::paintHeader() to fix issues with test results not being text/plain.
2010-01-10 13:05:35 -05:00
Mark Story
a41678e51f
Merge branch '1.3-misc' into 1.3-test-suite
2010-01-10 12:53:00 -05:00
Mark Story
6147de7725
Fixing notice errors in test case.
2010-01-10 12:52:06 -05:00
Mark Story
836c7de7cb
Updating CodeCoverageManager test case and CodeCoverageManager
2010-01-10 12:48:40 -05:00
Mark Story
cf5c48ecc5
Making CakeBaseReporter constructor take null for charset, so its easier to type.
2010-01-10 12:48:11 -05:00
Mark Story
e304246e8f
Updating test manager test cases to reflect changes in API.
2010-01-10 12:39:21 -05:00
Mark Story
a0aca7ee62
Adding output buffering to htmlreporter fixing issues with tests that send headers like Dispatcher test.
2010-01-10 12:34:55 -05:00
Mark Story
285ff5eb3b
Merge branch '1.3-misc' into 1.3-test-suite
2010-01-10 12:28:09 -05:00
predominant
0959de6031
Adding more tests to check cache paths and stupid values.
2010-01-10 20:54:20 +11:00
predominant
3bd8bd2e0e
Adding Inflector::underscore tests
2010-01-10 20:52:49 +11:00
Mark Story
f4bda62ea3
Adding doc blocks and correcting constructor of CakeCliReporter
...
Fixing TestSuite console code coverage output.
2010-01-09 23:00:03 -05:00
Mark Story
bcd7d34023
Refactoring breadcrumb and time generation in the CLI reporter.
2010-01-09 22:51:17 -05:00
Mark Story
d79bacd1ed
Making CodeCoverageManager get its settings from the reporter. This
...
makes code coverage much less reliant on GET parameters.
2010-01-09 22:42:00 -05:00
Mark Story
03da53bb92
Correcting classname used in CodeCoverageManager
...
Moving CodeCoverageManager::report() to be inside the html document.
2010-01-09 22:35:29 -05:00
Mark Story
f52900f818
Adding time and memory use to CakeCliReporter
2010-01-09 22:04:28 -05:00
Mark Story
7b5addec3e
Making CakeCliReporter a subclass of CakeBaseReporter.
...
Removing duplicated output from reporter message.
Adjusting formatting of output to be more readable.
2010-01-09 22:02:35 -05:00
Mark Story
081509a09c
Fixing typos.
...
Removing useless constant.
Fixing constructor
2010-01-09 21:30:46 -05:00
Mark Story
a8f289349e
Letting TestManager::getExtension accept either test or case as a test case type.
2010-01-09 21:29:57 -05:00
Mark Story
6a3152c518
Update file header.
2010-01-09 21:24:27 -05:00
Mark Story
9245719711
Updating TestManager::getExtension to be an instance method only.
...
Updating doc blocks for TestManager.
Removing CliTestManager as it is no longer used/needed.
2010-01-09 21:22:41 -05:00
Mark Story
b58f03b53f
Fixing package string on CakeBaseReporter
2010-01-09 20:20:13 -05:00
Mark Story
6721c4926d
Renaming CliReporter to CakeCliReporter, so it name matches the other new refactored reporters.
2010-01-09 20:19:49 -05:00
Mark Story
8a56793368
Correcting doc blocks.
2010-01-09 19:52:52 -05:00
Mark Story
5a10e52d1f
Updating package strings for reporters
2010-01-09 19:37:37 -05:00
Mark Story
f567d9aacc
Removing unnecessary TestManager subclasses
2010-01-09 19:35:01 -05:00
Mark Story
88f58dfbe8
Fixing missing headers when in plain text reporting.
2010-01-09 19:19:09 -05:00
Mark Story
e061a53358
Removing CakeTestMenu as its been made obsolete.
...
Removing constant use from reporter.
2010-01-09 11:25:35 -05:00
Mark Story
bdc84cd5d0
Renaming paintDocumentHeader to paintDocumentStart
...
Renaming paintDocumentFooter to paintDocumentEnd
Moving features from CakeTestMenu, HtmlTestManager, and TextTestManager into the appropriate Reporters.
2010-01-09 11:20:47 -05:00
Mark Story
c529d3c6e9
Refactoring test case list output generation into Reporters.
2010-01-09 10:55:58 -05:00
Mark Story
bc2dd3c987
Removing refactored header and footer.
2010-01-09 09:29:28 -05:00
tPl0ch
61079f6317
Fixes #42 . Updated Sanitize::clean() with 'remove_html' option. Updated Sanitize::html() to accept new options. Updated test cases.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-07 19:04:49 -05:00
Mark Story
a0f5d0fc02
Renaming menu template file.
...
Refactoring logic from CakeTestMenu into the Reporters.
2010-01-06 23:02:37 -05:00
Mark Story
4c0d90c502
Adding paintDocumentFooter and paintDocumentHeader to CakeBaseReporter and CakeHtmlReporter.
...
Refactoring case list and group lists to use reporter methods.
2010-01-06 22:52:04 -05:00
Mark Story
c01276a470
Moving header and menu display into CakeHtmlReporter.
...
Updating header.php with new variable.
2010-01-06 22:42:35 -05:00
tPl0ch
5ae0164574
Added Validation::uuid(). Updated test cases.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-06 21:29:55 -05:00
Mark Story
65a12ed902
Adding tests for previous commit.
2010-01-06 21:26:52 -05:00
Mark Story
683be26bcb
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-06 21:14:25 -05:00
predominant
e2a2770d9f
Fixing validation errors for wrong case checking on Validation::ip.
...
Adding IPv6 validation for Validation::url().
Added tests for ports in urls.
Fixed port length allowance on Validation.
2010-01-07 11:02:05 +11:00
Mark Story
be7ce6e923
Fixing issues where chained jQuery engine requests wouldn't eval() script elements, making ajax pagination much harder.
2010-01-06 11:59:15 -05:00
Mark Story
b6e22704ed
Refactoring and updating footer element to use param based basePath.
...
Moving footer inclusion to CakeHtmlReporter.
2010-01-06 09:50:39 -05:00
Mark Story
6b3e9583bf
Moving more direct GET access to params.
2010-01-06 09:46:48 -05:00
Mark Story
98cf758a98
Continuing refactoring of CakeTestMenu.
2010-01-05 23:16:12 -05:00
Mark Story
21afcef7cf
Updating CakeTestSuiteDispatcher to get base url and base dir. Refactoring xdebug and simpletest error pages. Starting to phase out CakeTestMenu.
2010-01-05 23:12:28 -05:00
Mark Story
44cacf6dad
Adding stub methods for upcoming refactoring of menu generation.
2010-01-05 22:52:25 -05:00
Mark Story
1e5923c75a
Moving templates to templates dir.
2010-01-05 22:51:39 -05:00
Mark Story
3c57dbee04
Refactoring methods from CakeTestMenu into CakeHtmlReporter.
...
Updating CakeTestSuiteDispatcher to reflect removed methods.
2010-01-05 22:20:32 -05:00
Mark Story
f228990c58
Updating doc blocks.
2010-01-05 20:56:25 -05:00
Mark Story
faafe5a0dc
Removing use of Set::filter(). Coupling the test suite to Set is not a good idea.
2010-01-05 20:52:22 -05:00
Mark Story
1d63d52d3c
Updating @link properties and spacing.
2010-01-05 20:44:15 -05:00
Mark Story
84c2bbdfe2
Making CakeTextReporter use CakeBaseReporter as its base class, moving methods from TextReporter.
2010-01-05 20:44:01 -05:00
Mark Story
0d7875f4ad
Extracting methods and features out into CakeBaseReporter.
2010-01-05 20:29:08 -05:00
Mark Story
5bd9734f96
Moving reporters to a directory and updating CakeTestSuiteDispatcher.
2010-01-05 20:10:41 -05:00
predominant
1302fba632
Fix validation of IPv6 on IPv4 checks.
...
Separate IPv4 and IPv6 validation to allow strict checking.
2010-01-06 00:53:48 +11:00
Mark Story
34ffa43119
Refactoring hardcoded extensions to use properties.
2010-01-05 00:13:03 -05:00
Mark Story
104086b928
Converting static calls to TestManager to use Manager instance in the TestSuiteDispatcher.
...
Converting static methods to instance methods.
2010-01-05 00:09:07 -05:00
Mark Story
e60d742c04
Whitespace updates.
2010-01-05 00:03:30 -05:00
Mark Story
48e1c4d08a
Removing duplicate method calls, and doing some refactoring of Reporter retrieval. Adding Manager instance var to help make subclassing more flexible in regards to TestManagers.
2010-01-04 23:58:09 -05:00
Mark Story
9a62fd52b3
Fixing occurances of CakeTestsGetReporter and fixing issues loading reporters.
2010-01-04 23:28:04 -05:00
Mark Story
dd5a886f3a
Removing CakeTestsGetReporter global function.
...
Starting to move Reporter/Manager decision making to CakeTestSuiteDispatcher, also affording the ability to use custom reporters/managers for generating test suite output.
2010-01-04 23:28:04 -05:00
Mark Story
33cb8eebfe
Renaming CakeHtmlReporter's file.
2010-01-04 23:28:03 -05:00
Mark Story
effc03ca3a
Adding CakeTestSuiteDispatcher to handle dispatching of the test suite.
2010-01-04 23:28:03 -05:00
Mark Story
183abfa4a9
Adding Docblocks to TextTestManager
2010-01-04 23:28:03 -05:00
Mark Story
8181acbb0b
Adding doc blocks to TestManager.
2010-01-04 23:28:03 -05:00
Mark Story
da19e31188
Refactoring duplicate switch logic to a single method.
2010-01-04 23:28:03 -05:00
Mark Story
a3b0805347
Fixing formatting.
2010-01-04 23:28:03 -05:00
Mark Story
397bdaf3e1
Removing global functions moved to CakeTestMenu
2010-01-04 23:28:03 -05:00
Mark Story
4d74dc6bda
Adding CakeTestMenu to clear up some global methods.
2010-01-04 23:28:02 -05:00
Mark Story
3d608d6fd7
Adding doc blocks to CakeHtmlReporter
2010-01-04 23:28:02 -05:00
Mark Story
2aee4b6e43
Adding sql dump back into test suite. Fixes #157
2010-01-04 23:25:23 -05:00
Mark Story
2ace6bb0b1
Updating Controllers used to test full page caching to reflect changes in CacheHelper's functionality.
2010-01-03 23:51:31 -05:00
Mark Story
95135d18cc
Merge branch '1.3' into 1.3-misc
2010-01-03 23:36:32 -05:00
Mark Story
32113a4c88
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-03 23:35:48 -05:00
Mark Story
a726f82f18
Fixing failing test caused by changes in Configure/App api's and merged code from 1.2
2010-01-03 23:35:17 -05:00
Mark Story
3c88d81735
Adding tests for model method validation with multiple parameters and addition of original validation rule to method params. Closes #149
2010-01-01 23:34:11 -05:00
predominant
e4fa475998
Test cases for model bake updates, refs #147
2010-01-01 20:19:15 +11:00
ADmad
5f987a4996
Controller data is now set to an array instead of Xml object if request content type is 'application/xml'
2009-12-31 17:36:58 +05:30
Mark Story
41e6fdf346
Merge remote branch 'fahad/1.3-l10n' into 1.3-misc
2009-12-29 23:39:08 -05:00
Mark Story
49e9550482
Merge branch '1.3' into 1.3-misc
2009-12-29 22:07:23 -05:00
Mark Story
32683d3d64
Fixing issues in PrototypeEngineHelper where parameters would end up wrapped in a function() {} when marked as a dataExpression. This prevented the sending of form data.
...
Tests added.
Fixes #142
2009-12-29 21:52:59 -05:00
Ali Farhadi
f86a80ac9e
Fixing failing tests caused by changes in L10n class, and removal of duplicate test.
2009-12-30 00:24:05 +03:30
Mark Story
b377905741
Fixing whitespacing and formatting of doc blocks.
2009-12-28 23:00:38 -05:00
Mark Story
b68d2a32bf
Merge branch '1.3' into 1.3-misc
2009-12-28 22:15:52 -05:00
Mark Story
6749e1166b
Making cacheAction array settings use action names instead of url paths. This removes the ability to set different durations for specific passed arguments. However, makes passed args, named params, and querystring params all behave the same in regard to cacheAction. Test cases updated.
2009-12-28 21:26:51 -05:00
Mark Story
b89280a916
Fixing test failures caused by changes in Cache::__loadEngine().
...
Adding tests for Cache::config().
2009-12-28 13:52:50 -05:00
Mark Story
45a3eb250f
Starting refactoring of cachehelper to use Router::reverse to generate check/match strings. Removing dead code as well.
2009-12-28 13:38:36 -05:00
Mark Story
df8914b2e4
Router::reverse now removes models and paging keys that controllers can insert into params arrays.
2009-12-28 13:34:05 -05:00
Mark Story
5b78a662e8
Adding tests for querystring reversal.
2009-12-27 23:10:29 -05:00
Mark Story
886cd9e719
Adding Router::reverse and basic test case.
2009-12-27 23:09:26 -05:00
Mark Story
7a620b62b0
Merge branch '1.3-misc' into mergers
...
Conflicts:
cake/libs/model/datasources/dbo_source.php
cake/libs/view/helpers/js.php
2009-12-27 12:45:12 -05:00
Mark Story
6b2154d961
Merge branch '1.2' into mergers
...
Conflicts:
cake/libs/inflector.php
cake/tests/cases/libs/model/model_validation.test.php
2009-12-27 12:34:27 -05:00
predominant
19924501d1
Updating Inflector to employ internal caching.
...
Refs #23
2009-12-25 18:53:38 +11:00
Joël Perras
173b4e7b5d
Merge branch '1.3-misc' of github.com:cakephp/cakephp1x into 1.3-misc
2009-12-22 23:53:01 -05:00
Joël Perras
8eb9f9e8fd
Implenting IPv6 validation using filter_var(), with a regex-based fallback if the aforementioned function does not exist (PHP < 5.2). Fixes #38 .
2009-12-22 23:52:06 -05:00
Mark Story
e7a5143aa9
Adding tests for after = false in currency(). Refs #34
2009-12-22 19:11:52 -05:00
Mark Story
1a387e6b8a
Fixing url parameters set with options() or beforeRender not being merged on next() / prev().
...
Tests added. Fixes #129
This reverses the change made in efa36abdf0
which broke this behavior.
2009-12-22 19:05:06 -05:00
Mark Story
5274dce9f1
Making set vars with Js->set go to the top of the buffered scripts array. Tests added.
...
Updating doc blocks for JsHelper and JsBaseEngineHelper.
Fixes #131
2009-12-21 09:41:36 -05:00
Mark Story
42fa6ff04a
Fixing JsHelper::writeBuffer when inline is set to false. Scripts are now enclosed in a script tag. Fixes #130
2009-12-21 09:29:28 -05:00
ADmad
d561405daa
Renaming RequestHandler::getReferrer to RequestHandler::getReferer for (mis)spelling consistency and deprecating the former
2009-12-20 23:06:28 +05:30
ADmad
f36e5eff5f
Merge branch '1.3-misc' of github.com:cakephp/cakephp1x into 1.3-misc
2009-12-20 13:22:43 +05:30
Mark Story
55f8668016
Updating lib group with omitted classes.
2009-12-19 20:32:34 -05:00
Mark Story
3cdf22d860
Correcting tests affected by changes in Router.
2009-12-19 20:22:16 -05:00
Mark Story
79cd856e19
Updating ExtractTask test case to reflect changes made in df8895a266
. Domain strings are no longer default merged into default.pot.
2009-12-19 20:18:18 -05:00
Mark Story
e95186d5cc
Fixing failing test in ApiShell test.
2009-12-19 20:08:31 -05:00
Mark Story
3edb84d77c
Adding skip for BakeShell test, if a User class exists bake all cannot be tested.
2009-12-19 20:01:59 -05:00
Mark Story
c669f8c998
Fixing failing tests in AuthComponent because of required parameter.
2009-12-19 19:58:55 -05:00
Mark Story
22cf13b6b6
Updating DboSource test to remove protected access and use methods instead.
2009-12-19 19:54:49 -05:00
Mark Story
3f7405c8d6
Removing cakeDebug from test_app layout.
...
Adding skips for tests that can cause failures when cache dirs are not writable.
2009-12-19 19:47:20 -05:00
Mark Story
7467224455
Moving test case and adding doc block.
2009-12-19 19:41:25 -05:00
Mark Story
4ac0a55aff
Merge branch 'virtual-fields' into 1.3-misc
...
Conflicts:
cake/tests/cases/libs/controller/controller.test.php
2009-12-19 19:40:12 -05:00
ADmad
cea102c357
Updating doc block to reflect that url can be string or array and removing 'escapeTitle' param. Use key 'escape' in options instead
2009-12-20 00:46:47 +05:30
Mark Story
071c6f0e8b
Merge branch 'sql-dump' into 1.3-misc
2009-12-19 13:32:01 -05:00
Mark Story
a89fcba243
Updating DboSource::getLog() and showLog() to use a View element.
...
Updating tests to reflect changes in getLog()
2009-12-19 12:09:01 -05:00
Mark Story
3eaff3e021
Correcting FormHelper::minute() to fix issues with extracting values from array formatted data. Fixes #107
2009-12-19 11:55:35 -05:00
Mark Story
18c878b3f5
More whitespace fixes.
2009-12-18 19:18:23 -05:00
Mark Story
ab21855efd
Fixing whitespacing.
2009-12-18 19:16:10 -05:00
Mark Story
959befb6e1
Merge commit 'josezap/virtual-fields' into virtual-fields
2009-12-18 19:11:50 -05:00
Mark Story
6356c6ed87
Fixing issue where forms generated with requestAction would be missing the _Token fields that Security component creates. Test cases added to ensure that token key does not change when requestAction is used.
...
Fixes #68
2009-12-18 19:05:33 -05:00
José Lorenzo RodrÃguez
98e7575c5a
Adding documentation on tests
2009-12-17 14:50:36 -04:30
José Lorenzo RodrÃguez
8f29f59c1a
Enclosing virtual fields in parentheses to avoid SQL errors
...
Added new tests to improve code coverage on virtual fields
2009-12-17 14:42:46 -04:30
Mark Story
1e7e650133
Fixing issue where _restructureParams would move controller key to the plugin key causing issues switching controllers. Tests added. Fixes #115
2009-12-17 10:16:47 -05:00
Mark Story
264cdb78c0
Removing unnecessary key.
2009-12-17 10:13:05 -05:00
Mark Story
b190e462b8
Fixing whitespacing.
2009-12-17 00:15:42 -05:00
Mark Story
e8f0ea951a
Updating tests and doc blocks for JsHelper::writeBuffer() to return null if no scripts have been buffered. Fixes #108
2009-12-16 23:48:29 -05:00
Mark Story
0bc1126114
Merge branch 'component-settings' into 1.3-misc
2009-12-16 23:08:16 -05:00
Mark Story
8960a01649
Merge branch '1.3-misc' of git@github.com:cakephp/cakephp1x into 1.3-misc
2009-12-16 23:08:00 -05:00
Mark Story
9230bb93af
Merge branch '1.3' into 1.3-misc
2009-12-16 23:07:44 -05:00
Mark Story
ff74a599c6
Adding ability to set configuration from initialize() for RequestHandler.
...
Tests added.
2009-12-16 23:06:16 -05:00
Mark Story
5760f41124
Adding tests for component config setting from initialize()
2009-12-16 23:06:16 -05:00
Mark Story
e45fcf4337
Adding ability set component configuration from component settings for SecurityComponent.
2009-12-16 23:06:16 -05:00
Mark Story
3a6b29d042
Updating security component test case to use startTest and endTest
2009-12-16 23:06:16 -05:00
Mark Story
dffff314e1
Implementing setting of auth configuration through component settings arrays.
...
Adding test case from Ceeram.
2009-12-16 23:06:16 -05:00
Mark Story
9a4e78af82
Adding file missed in previous commit.
2009-12-16 22:16:59 -05:00
Mark Story
aa3a197b26
Reformatting test case. Fixes #104
2009-12-16 18:40:45 -05:00
real34
bdfb50e6bb
Fixed a bug in Set::extract. Wrong key returned when two arrays are at the extraction level.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-16 18:33:23 -05:00
burzum
07870bacfb
Merge branch '1.3' of git://github.com/cakephp/cakephp1x into 1.3
2009-12-17 00:32:37 +01:00
burzum
7aca8dfea4
Refactoring Dispatchter::cached() and moving asset related code from this method into separate methodes
2009-12-17 00:32:20 +01:00
Mark Story
5c6d59ea13
Adding tests for dispatching plugin shortcut urls.
...
Refactoring Dispatcher::__getController, Dispatcher::_restructureParams to fix compatiblity between router and Dispatcher.
2009-12-16 16:33:08 -05:00
Phally
e5836ff4e9
Implemented rendered e-mail retrieval.
2009-12-16 21:47:12 +01:00
Mark Story
7ceb50b696
Removing controller key as a default when Routes are connected. Was causing issues when using regex qualifiers on controller keys.
...
Tests added.
2009-12-16 15:04:59 -05:00
Mark Story
a490e249fa
Adding test for validation of with models canceling a save.
...
Adding initial implementation of Model::__validateWithModel().
Correcting error in previous commit. Adding tests for saveAll and validating habtm with models.
2009-12-15 22:55:22 -05:00
ceeram
64045e1e18
Apply new Helper syntax to remaining files
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-14 18:52:13 -05:00
Mark Story
ecc38f0aed
Adding additional tests for CakeRoute::persistParams(). Ensures that url params can overwrite persisted values.
...
Tests added.
2009-12-14 18:43:29 -05:00
Mark Story
4f985e465b
Applying patch from 'kleingeist'. JsHelper::set() now generates a variable that is assigned to window.$var instead of creating a local variable by default.
...
Tests updated.
Fixes #96
2009-12-13 23:53:20 -05:00
predominant
aaddd0d394
Moving certain datasources to the Datasources Plugin ( http://github.com/cakephp/datasources )
2009-12-13 23:53:20 -05:00
Joël Perras
7b1ccfff57
Changing error handler to send a HTTP/1.1 500 error when missingTable, missingDatabase or missingConnection is encountered. Increased test coverage of libs/error.php to 100%. Fixes #70 .
2009-12-13 23:53:19 -05:00
Joël Perras
96c245c6a7
Moving list of http codes out of Controller::redirect() and into a new method, Controller::httpCodes() for better reusability. See doc blocks for usage details.
2009-12-13 18:04:55 -05:00
Mark Story
02330b2d9c
Making DboSource::fields() accept an expression object. Fixes issues with sql parsing over quoting special SQL syntax.
...
Tests added
Fixes #66
2009-12-13 15:52:07 -05:00
Joël Perras
25ec51d3ae
Merge branch '1.3' into 1.3-misc
2009-12-13 15:42:13 -05:00
Mark Story
47a9401d43
Adding test case for cached view files, and fatal errors caused by the view instance not being registered. View instances are now registered when rendering view caches, and unregistered if the cached view fails. This fixes issues rendering flash messages with custom layouts and fixes FormHelper methods inside nocache blocks.
...
Fixes #60
2009-12-13 12:39:39 -05:00
Mark Story
904b9f5f1c
Adding test and fix to ensure the debug = 0, log = false leaves error_reporting set to 0.
...
Fixes #89
2009-12-11 00:46:13 -05:00
Mark Story
6615094350
Merge branch '1.3' into 1.3-misc
2009-12-10 23:42:55 -05:00
Mark Story
f26d5efd0c
Applying patch from 'kleingeist'. JsHelper::set() now generates a variable that is assigned to window.$var instead of creating a local variable by default.
...
Tests updated.
Fixes #96
2009-12-10 23:37:55 -05:00
José Lorenzo RodrÃguez
c65e2f3f18
Quoting virtual fields in automatically
...
Updating test cases
2009-12-10 20:46:55 -04:30
José Lorenzo RodrÃguez
8c4cad86c2
Fixing erroris due to bad rebase
2009-12-10 20:35:24 -04:30
José Lorenzo RodrÃguez
e7ee5e9eda
Fixing faling test case
2009-12-10 20:08:14 -04:30
José Lorenzo RodrÃguez
7a7d0de988
Adding support for virtual fields in DboSourse::calculate
2009-12-10 20:08:14 -04:30
José Lorenzo RodrÃguez
d06ff5d10a
Adding support for virtual fields in conditions array
2009-12-10 20:08:14 -04:30
José Lorenzo RodrÃguez
cf359a38b3
Re-adding ability to order by virtual fields in DboSource::order
...
Adding support for paginating virtual model fields in controller
2009-12-10 20:08:14 -04:30
José Lorenzo RodrÃguez
051d352eab
Reimplementing DboSource::order() to avoid recursion so it can be more easily manipulated to add virtual fields (and hopefully to make it a little bit faster)
2009-12-10 20:08:14 -04:30
José Lorenzo RodrÃguez
5a58813031
Making DboSource order by virtual fields
2009-12-10 20:08:13 -04:30
José Lorenzo RodrÃguez
7efafc685e
Fixing virtual fields fetching for Model::field() calls
...
Adding doc blocks
2009-12-10 20:08:13 -04:30
José Lorenzo RodrÃguez
a81edb6080
Extending virtual fields implementation to work on queries with field list
2009-12-10 20:07:46 -04:30
José Lorenzo RodrÃguez
53765312df
Initial implementation of model virtual fields
2009-12-10 20:07:07 -04:30
José Lorenzo RodrÃguez
2503632327
Working on virtual fields on order clause.
2009-12-10 20:05:10 -04:30
José Lorenzo RodrÃguez
ec672e99e8
Fixing virtual fields fetching for Model::field() calls
...
Adding doc blocks
2009-12-10 20:05:10 -04:30
José Lorenzo RodrÃguez
00c0bb4d62
Extending virtual fields implementation to work on queries with field list
2009-12-10 20:01:58 -04:30
José Lorenzo RodrÃguez
19c91f1f70
Initial implementation of model virtual fields
2009-12-10 20:01:58 -04:30
predominant
df151395c5
Moving certain datasources to the Datasources Plugin ( http://github.com/cakephp/datasources )
2009-12-11 01:07:23 +11:00
Mark Story
ecea49f823
Updating AuthComponent's mapped actions features to use Router::prefixes()
...
Adding tests for prefix interactions.
Adding tests for AuthComponent::logout, increasing code coverage.
2009-12-09 00:25:21 -05:00
Mark Story
76780ab99c
Updating uses of Routing.admin to be Routing.prefixes, as Routing.admin is deprecated.
2009-12-08 23:52:02 -05:00
Mark Story
f8a406e9fa
Removing dead test case, its covered by the CakeRoute tests.
2009-12-08 23:10:51 -05:00
Mark Story
de7658e78b
Modifying FormHelper::create() and FormHelper::secure() to use hidden divs instead of hidden fieldsets. This improves the semantics of FormHelper and allows generated html to more easily pass HTML4.0 validation.
...
Test cases updated.
2009-12-08 22:58:08 -05:00
Mark Story
7c2cdb1fb4
Adding tests to Xml::toString to disprove #395
2009-12-08 22:00:55 -05:00
Mark Story
17777af3d3
Adding test case, and removing unreachable code.
2009-12-08 21:43:29 -05:00
Mark Story
4421fe6dc3
Fixing issues in router where plugin => null would not always exit a plugin route. Test cases added.
2009-12-08 21:36:25 -05:00
Mark Story
efa36abdf0
Fixing double merging of url options in paginator helper. This was causing duplicate passed url parameters in next()/prev().
...
Test cases added.
Fixes #391
2009-12-08 10:01:33 -05:00
predominant
c64389006d
Removing "Long description for file" from /cake/tests tree.
2009-12-08 20:19:42 +11:00
ADmad
e2c4c0d4de
Removed adding of Html and Form helper by default to baked controllers as its not DRY and they are alrady inherited from Controller class. If var helpers is declared in AppController, Html and Form should be included there.
2009-12-08 01:41:52 +05:30
mark_story
24b636cc71
Merge branch 'mergers' into 1.2-merger
...
Conflicts:
cake/libs/view/helpers/text.php
cake/tests/cases/libs/view/helpers/text.test.php
2009-12-06 22:03:17 -05:00
mark_story
1f5c6eac2e
Fixing issues in tests caused by overwritten columns.
...
Fixing issue where mysqli had errors using getCharsetName, moving DboMysqlBase::getCharset down to DboMysql.
2009-12-06 21:46:05 -05:00
mark_story
7259a1b920
Merge branch '1.2' into 1.2-merger
...
Conflicts:
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/helpers/text.php
cake/libs/view/theme.php
2009-12-06 21:43:53 -05:00
mark_story
b3b9ae39e3
Fixing failing tests in View::uuid() caused by changes to trailing / in Router::url()
2009-12-06 21:21:07 -05:00
mark_story
360810a1cf
Merge branch '1.3-router' into mergers
2009-12-06 21:11:47 -05:00
mark_story
bbb61b28f7
Merge branch '1.3-misc' into mergers
2009-12-06 21:11:26 -05:00
mark_story
4cefb5fbd0
Applying patch from kleingeist to fix Js->value incorrectly calling Helper::value()
2009-12-06 20:45:12 -05:00
mark_story
cc750d15f1
Adding test to disprove #385 . Proves saveAll with validate => first behaves correctly.
2009-12-04 14:39:12 -05:00
mark_story
0047ac8f34
Renaming RouterRoute to CakeRoute
2009-12-03 21:20:08 -05:00
mark_story
8c4d389760
Implementing the ability to use custom Route classes when connecting routes. Tests added.
2009-12-03 20:50:13 -05:00
mark_story
aff7d61277
Merge branch '1.3-misc' into 1.3-router
2009-12-03 19:13:28 -05:00
AD7six
9cd7888991
removing reference to unused variable __bare
2009-12-03 21:33:56 +01:00
mark_story
3b74c93582
Changing how helpers are extracted, fixes issues with view variables not overwriting local helper variables. Fixes #381
2009-12-03 09:55:49 -05:00
mark_story
0806545f35
Adding passthrough to localized Validation class for Validation::ssn. Tests added. Fixes #378
2009-12-02 20:57:14 -05:00
mark_story
16f6d4d408
Making the various SecurityComponent::requireXX methods accept a single array or a list of strings as their arguments. Unifies the use of these functions with AuthComponent. Fixes #354
2009-12-02 17:56:52 -05:00
mark_story
0b13e3d5b9
Removing whitespace.
2009-12-02 11:37:43 -05:00
Phally
324b479b1c
Refactored test case.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-02 11:23:17 -05:00
Phally
bb92a47ddb
Added support for numeric values in expectation of assertTags().
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-02 09:10:56 -05:00
mark_story
494875cca2
Renaming RouterRouter::$params to $options.
2009-12-02 00:20:51 -05:00
mark_story
e741e0e4cb
Adding test for previously broken reverse routing feature, where parameters that only partially passed the pattern would be accepted.
2009-12-01 15:04:53 -05:00
mark_story
21dd7fd4ca
Fixing connection of plugin routes, the were being connected in the wrong spot.
...
Moving admin route + plugin tests to correct place.
Fixing order of methods in tests. parse() should only be called after routes are connected otherwise the default routes will precede the custom routes.
2009-12-01 14:39:23 -05:00
mark_story
a5a02925d8
Adding test for previous commit.
2009-12-01 13:38:32 -05:00
mark_story
a8f79f9fe5
Removing defaults that are also keys this makes the actions with the default index key work much better. Also things can't be both a variable and a constant routing parameter.
2009-12-01 13:37:03 -05:00
mark_story
0293a840c5
Adding test to disprove #368 . FormHelper::year() is working correctly and includes model name in the input name attribute.
2009-11-30 13:43:26 -05:00
mark_story
393038816c
More tests passing in RouterTest now.
2009-11-30 10:15:39 -05:00
mark_story
cd46f4db2e
Fixing function signature of ThemeView constructor. Fixes issues where ThemeView would always be registered causing issues with EmailComponent and themed views. Fixes #370
2009-11-30 09:19:25 -05:00
mark_story
11dd7898c4
Fixing tests + adding tests for passed args order preservation when passed args are part of default route parameters.
2009-11-30 00:23:41 -05:00
mark_story
e41c408378
Adding parameter pattern matching back into RouterRoute::match(), fixes failing tests in RouterRoute test case.
2009-11-29 23:46:02 -05:00
mark_story
5999264f10
Most of RouterRoute::match() working now. Failing tests for params with patterns included.
2009-11-29 22:57:10 -05:00
mark_story
de0b90db4a
Moving addition of plugin and controller keys to Router instead of RouterRoute.
2009-11-29 16:21:33 -05:00
mark_story
9e9559b350
Working on RouterRoute::match(). Adding tests for RouterRoute::match() and removing defaults from routes that don't need defaults.
2009-11-29 16:09:45 -05:00
mark_story
b242dc9531
Moving parameter persist to RouterRoute.
...
Tests updated.
2009-11-29 10:59:38 -05:00
mark_story
f59b8daf2e
Expanding tests for passed arguments in route defaults working correctly. Refactoring passed arguments in route default handling.
2009-11-29 09:49:19 -05:00
mark_story
889e367510
Expanding and correcting doc block for router::connect.
2009-11-28 23:37:40 -05:00
mark_story
5b4d15dc3b
Removing support for mid route * elements. Mid-route lazy * behaved in a sometimes erratic fashion making routes employing mid-route lazy * hard to depend on.
2009-11-28 21:54:33 -05:00
mark_story
33c67f7c47
More tests passing and more code moved from Router to RouterRoute. Switching RouterRoute to used named capture groups. This simplifies the route processing internals as there are fewer loops used to merge array sets together.
2009-11-28 09:40:15 -05:00
mark_story
4cb055ff0a
Removing tests for features no longer supported. Path elements containing only regular expressions are no longer supported. They did not effectively reverse route. And they provided an inconsistent behavior when combined with the full gamut of regular expressions and routing parameters.
2009-11-27 17:12:35 -05:00
mark_story
26aa3731e0
Fixing _name_ elements being inserted into serialized xml from Xml lib. Test case added. Fixes #367
2009-11-27 14:27:32 -05:00
phpnut
8bc84948f0
Adding more tests for theme assets
2009-11-27 10:27:15 -06:00
mark_story
49c6cd3f9f
Fixing issues with optional parameters. Allows route params to be made optional by setting a pattern definition.
2009-11-27 09:58:51 -05:00
phpnut
43fdde2dad
Removing unneeded code in Dispatcher::cached();
...
Fixing path search for themes
2009-11-27 00:49:20 -06:00
mark_story
fd98bc5d76
Expanding tests on Router and RouterRoute.
2009-11-26 23:46:42 -05:00
mark_story
feb0dec970
Starting tests for RouterRouter::parse()
2009-11-26 23:01:54 -05:00
mark_story
89d0ed8f3b
Route compilation tests passing again.
2009-11-26 21:42:33 -05:00
phpnut
903a1fd95a
Adding new Configure::$App['www_root']
...
Helper::webroot(); will now check for theme assets in APP/webroot/theme/<theme_name>/
Adding ico key to Media::$mimeType;
Fixed bug in previous commits that would not use views/themed/<theme_name>/layouts/ from a plugin
Adding test cases for Helper::webroot();
Adding more tests for ThemeView.
2009-11-26 14:52:38 -06:00
mark_story
3907893263
Adding tests for incorrect function used in form.ctp.
...
Fixing mistyped function name. Fixes #364
2009-11-26 09:52:15 -05:00
mark_story
c4ceeabcf5
More tests and more passing tests for Route compilation.
...
Basic route compiling complete.
2009-11-26 09:41:05 -05:00
phpnut
3ad0595b86
Forgot to add plugin elements for additional tests
2009-11-25 23:20:43 -06:00
mark_story
6661c2fa70
Starting to refactor RouterRoute::_writeRoute
2009-11-26 00:17:43 -05:00
phpnut
f83a024a10
Increasing code coverage for View and ThemeView
2009-11-25 23:17:15 -06:00
phpnut
948f6b21e5
Refactored last commit changes are:
...
To override plugin views with a themed version of the view you would create:
<app_name>/views/themed/<theme_name>/plugins/<plugin_name>/<controller_name>/*.ctp
To override plugin views at the app view level you would create:
<app_name>/views/plugins/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:58:02 -06:00
mark_story
0b9ae92eb9
Adding a test case for RouterRoute to increase code coverage.
2009-11-25 23:51:27 -05:00
mark_story
1d7881b16f
Renaming connectDefaults to defaults().
...
Updating tests.
2009-11-25 23:39:07 -05:00
phpnut
21eb001a96
Refactoring themes/views to use a centralized location instead of allowing plugins to have themes.
...
The plugin should include all required views/assets, to override these at the application level using themes you would create:
<app_name>/views/themed/<theme_name>/<plugin_name>/<controller_name>/*.ctp
if you are not using themes you can override them at the app view level:
<app_name>/views/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:29:54 -06:00
mark_story
52264cb61c
Fixing persistent param route exiting.
...
Adding test for exiting persist param routes.
2009-11-25 23:12:48 -05:00
mark_story
35fac165b3
Merge branch '1.3-misc' into 1.3-router
...
Conflicts:
cake/libs/router.php
2009-11-25 22:57:42 -05:00
mark_story
dc769041f3
Updating project task test case to reflect changes in skel dir.
2009-11-25 22:52:33 -05:00
mark_story
dd4fbbab45
Updating PluginTask to create webroot dir and no longer create vendors/css, vendors/js and vendors/img
2009-11-25 22:50:50 -05:00
mark_story
e345b2f788
Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-25 22:23:38 -05:00
phpnut
d685c18720
Adding checks for directory traversal attempts related to recent changes allowing plugins and themes to include their own webroot/* assets
2009-11-25 12:41:19 -06:00
phpnut
49c11a8219
More work allowing assets in themes and plugins.
2009-11-25 11:06:28 -06:00
phpnut
c942fa7038
Merge branch '1.3' of code.cakephp.org:cakephp into 1.3
2009-11-25 08:40:14 -06:00
phpnut
2254bfe5c9
Adding ability for plugins to have there own webroot.
...
plugins/<PLUGINNAME>/webroot/*
Themes can also be self contained with a webroot directory.
app/views/themed/<THEMENAME>/webroot/*
vendors directory for assets is deprecated and no longer supported
2009-11-25 01:51:25 -06:00
mark_story
3b1256cefb
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-24 22:10:11 -05:00
dogmatic
53bfc8cca2
a new take on toList and more tests for passing a different separator
2009-11-24 22:00:33 -05:00
dogmatic
398113f828
fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:27:56 -05:00
dogmatic
51d0805ce0
fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:23:23 -05:00
mark_story
c94702506d
Fixing fails in Set::reverse caused by _log property being removed from Object.
2009-11-22 21:31:44 -05:00
mark_story
8cdee90b4f
Merge branch '1.3-misc' into 1.3-merger
...
Conflicts:
cake/libs/view/helpers/html.php
2009-11-22 21:28:14 -05:00
mark_story
4d37e75f18
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/controller/components/cookie.php
cake/libs/debugger.php
cake/libs/flay.php
cake/libs/http_socket.php
cake/libs/inflector.php
cake/libs/model/cake_schema.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo_source.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
ceeram
cd6fd74caf
Added -empty flag for ProjectTask to bake with empty dir files, tests included
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 18:18:14 -05:00
mark_story
2e0acbf505
Making habtm join conditions used by __saveMulti when finding link records to remove. It should be noted that having conditions on non-joinTable tables, and not having a model on the joinTable can cause SQL issues. Fixes #304
2009-11-22 17:56:46 -05:00
mark_story
6c3bcdd7e6
Removing commented code.
2009-11-22 17:34:11 -05:00
Juan Basso
c6c7474502
Fix test of the size of lines in MagicDb (included test for it).
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 12:27:57 -05:00
mark_story
6b3b2a629b
Removing CakeSession::__validateKeys() its no longer needed due to CakeSession using Set to manipulate the session values. Adding test case for exploit shown in https://trac.cakephp.org/ticket/2041
2009-11-21 20:44:35 -05:00
mark_story
a729fc4d62
Merge branch '1.3-cache' into 1.3-misc
2009-11-21 17:16:38 -05:00
mark_story
c11509483c
Removing use of Helper::output from core helpers.
...
Removing duplicated test caused by merge in form helper test.
2009-11-21 16:43:54 -05:00
mark_story
d37dd4c49f
Updating doc block for FileEngine.
...
Fixing Cache::set() so strtotime compatible durations are handled properly.
Restoring previous change in Xcache test case.
2009-11-21 16:09:06 -05:00
mark_story
fb7d99e6b3
Making XcacheTest use refactored Cache API.
2009-11-21 15:44:03 -05:00
mark_story
3f067ed166
Updating ApcEngine test to use the new Cache engine api.
2009-11-21 15:26:17 -05:00
mark_story
5ff2e66f75
Updating memcache test to use new Cache api.
...
Removing most private access in the test case.
2009-11-21 15:26:17 -05:00
mark_story
266cddb4db
Removing whitespace.
2009-11-21 15:26:16 -05:00
mark_story
4b184ceccb
Updating FileEngine test to use new Cache api methods.
2009-11-21 15:26:16 -05:00
mark_story
14d643ff99
Fixing File cache test to run with modified Cache API.
2009-11-21 15:26:16 -05:00
mark_story
95f8ed5b55
Additional refactoring and code removal.
2009-11-21 15:26:16 -05:00
mark_story
0ba622bb0e
Removing debug changes.
...
Updating isInitialized() to its new use.
Refactoring Cache engines to no longer be singletons with heavy settings manipulation. Instead each config() is a separate instance.
2009-11-21 15:26:16 -05:00
mark_story
3404f1ed39
Adding documentation to Cache::config().
...
Adding tests for default configuration manipulation of config().
2009-11-21 15:26:16 -05:00
mark_story
b1c89496c5
Fixing typo in Cache doc block.
...
Updating formatting in Xcache doc block.
Fixing Xcache test case so it passes when username and password are not user & password.
2009-11-21 15:19:11 -05:00
Juan Basso
71df8dbbba
Replace function sizeof (alias) by count.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:50:57 -05:00
Juan Basso
df9e1e0bd1
Replace function join (alias) by implode.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05:00
Juan Basso
1acc60b04c
Replace function die (alias) by exit.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:38:11 -05:00
burzum
67cea6d21c
Fixing a problem with setting Paginator::sort() defaults directon to desc
2009-11-17 02:11:23 +01:00
Jippi
e6801c22e1
Merge branch '1.3' of code.cakephp.org:cakephp into 1.3
2009-11-16 23:19:11 +00:00
Jippi
2cb0c3acb3
Changed SessionHelper::flash to return message instead of echoing it
2009-11-16 23:15:24 +00:00
mark_story
aa97daeea9
Updating test due to merge conflicts.
2009-11-15 20:09:35 -05:00
mark_story
acd2c15690
Merge branch '1.3-misc' into 1.3-merger
...
Conflicts:
cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -05:00
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
a292ef0f16
Adding ability to provide default plugin value to pluginSplit().
2009-11-15 19:54:33 -05:00
mark_story
20a114a1cd
Adding $dotAppend to pluginSplit()
2009-11-15 19:12:00 -05:00
mark_story
db0c030557
Adding pluginSplit and test case. pluginSplit consolidates a number of repeated code blocks.
2009-11-15 18:16:12 -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
mark_story
31102ad412
Adding tests for App::pluginPath that were omitted before.
2009-11-15 16:38:02 -05:00
mark_story
0b2fc5b35f
Adding tests for phone() pass through to localized class.
2009-11-14 20:52:11 -05:00
mark_story
fa14f9cebc
Merge branch '1.3-validation' into 1.3-misc
2009-11-14 20:46:48 -05:00
mark_story
b452e8367f
Adding tests for CakeLog::drop()
2009-11-14 20:44:42 -05:00
mark_story
be9f0ec4c7
Renaming method so they match those in Cache.
...
Removing method that was missed during previous refactor.
Updating tests.
2009-11-14 20:42:57 -05:00
mark_story
fb483e9bff
Adding file headers.
2009-11-14 20:25:45 -05:00
mark_story
b7e7eff738
Fixing doc blocks.
2009-11-14 20:24:18 -05:00
mark_story
70820e2e96
Renaming unconfig to drop.
2009-11-14 20:18:58 -05:00
mark_story
caedbdf98a
Adding Cache::configured() and Cache::unconfig(). configured() allows introspection on the currently configured settings. unconfig() allows for the removal of cache configs.
...
Tests added.
2009-11-14 20:10:40 -05:00
mark_story
040f94cb81
Adding test case files used for previous commit.
2009-11-14 20:10:40 -05:00
mark_story
b6978ab25f
Adding the ability to load cache engine classes from plugins and app libs.
...
Also enabled the ability for App cache classes to override core ones.
Test cases added.
Removed unnecessary subclassing of Object.
2009-11-14 20:10:40 -05:00
mark_story
2740fd6714
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-14 19:42:24 -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
mark_story
06d4e5e553
Reformatting code in memcache.
...
Adding unset() to test case to remove unnecessary keys that can cause test failure.
2009-11-14 18:50:23 -05:00
predominant
ac86ad05ac
Moving access modifier doc tag.
2009-11-14 23:38:52 +11:00
predominant
0977b3fe15
Standardising docblock endings throughout.
2009-11-14 23:19:25 +11:00
predominant
5092262d4d
Reformatting and adding missing documentation blocks.
2009-11-14 23:18:31 +11:00
mark_story
9376826aa4
Fixing HttpSocket::buildUri when host key is empty.
...
Tests added
Fixes #271
2009-11-13 14:42:40 -05:00
mark_story
360ea2a46a
Adding extract task to Console Group test.
2009-11-13 10:24:36 -05:00
mark_story
d93c94f702
Fixing failing test, picked in from 1.2.
2009-11-13 09:53:31 -05:00
mark_story
bfde6b81fe
Adding test to form helper to increase code coverage.
2009-11-13 09:48:31 -05:00
mark_story
8d407ac915
Adding test to form helper to increase code coverage.
2009-11-13 09:45:25 -05:00
mark_story
d302ed1bfa
Fixing comment block formatting.
2009-11-13 09:44:51 -05:00
ceeram
ea482442ff
test to prove ticket #291
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-13 09:22:05 -05:00
mark_story
2c5fa171e0
Updating CakeSchema to pass a Model object into DboSource::fullTableName(); Fixes schema's not correctly reading tablePrefixes.
...
Fixes #290
2009-11-13 00:43:40 -05:00
nate
1c8a2f232b
Changes Model::find() to allow modification of DataSource connection during callbacks.
2009-11-12 14:48:03 -05:00
renan.saddam
8cab87fd8e
Fixing fixtures path when using a fixture inside a plugin.
2009-11-11 20:14:24 -02:00
mark_story
63ee8f0fcd
Starting pass through validation handling.
...
Implemented phone, and postal pass throughs.
Adding tests.
2009-11-10 21:20:39 -05:00
mark_story
b39b38aac9
Adding missing variable.
...
Adding Test case for previous commit.
2009-11-10 09:17:54 -05:00
mark_story
f0628d100b
Fixing issues with getting values from habtm data after form posting and validation has failed.
...
Tests added.
Refs #279
2009-11-09 21:00:19 -05:00
mark_story
adaa2b689c
Adding test case for previous commit.
...
Fixing function for non-windows paths.
2009-11-09 20:10:24 -05:00
mark_story
c4b493c934
Manually merging changes from ModelTask in 1.2 to FixtureTask
...
Adding test cases for FixtureTask.
2009-11-08 22:22:08 -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
a7a6dc8c43
Fixing issue where SecurityComponent::_validatePost could generate notices if elements were removed from _Token array.
...
Tests Added
Fixed #228
2009-11-08 14:12:18 -05:00
mark_story
6db91b0f49
Fixing issues in ContainableBehavior that could leave models unbound when 'fields' was used as part of containment conditions. Fixes #253
2009-11-07 17:43:18 -05:00
ceeram
dd0c4a64c5
Test to prove ticket #253
2009-11-07 11:02:43 -05:00
mark_story
4a08bd120d
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-07 10:41:12 -05:00
ADmad
002a01a9d8
passedArgs from current request are auto merged with url options of paginator helper
...
Signed-off-by: Florian Krämer <florian.kraemer@cakedc.com>
2009-11-06 18:31:42 +01:00
mark_story
ab76cb1217
Merge branch '1.3' into 1.3-misc
2009-11-06 09:25:11 -05:00
predominant
884490f1a1
Removing leftover SVN tags.
2009-11-06 18:35:14 +11:00
predominant
62810fb4f4
Updating more Copyright dates.
2009-11-06 18:04:38 +11: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
mark_story
4bbfcbff7e
Fixing limit:0 and controller::paginate. Removes possibilty to generate sql errors by inputting invalid limit options. Tests updated. Refs #264
2009-11-06 00:44:21 -05: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
531eaaad4e
Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc
2009-11-06 15:54:01 +11:00