Commit graph

410 commits

Author SHA1 Message Date
Jose Lorenzo Rodriguez
89b1e54071 Removing Oracle driver, it will not make it to stable release. Revert this commit to bring it back for next version 2011-09-03 06:50:19 -04:30
mark_story
efbeab6199 Merge branch '1.3' into merger
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	lib/Cake/Console/Command/Task/DbConfigTask.php
2011-09-03 00:48:09 +01:00
Mark Story
59c6b419e5 Merge branch '1.3' into merger
Conflicts:
	cake/console/libs/bake.php
	cake/libs/configure.php
	cake/libs/controller/components/request_handler.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Test/Case/Controller/ScaffoldTest.php
	lib/Cake/Utility/Validation.php
2011-08-28 22:08:49 -04:00
Juan Basso
f5a54d00dd Changed methods and attributes from private to protected. 2011-08-20 00:43:34 -04:00
Juan Basso
40654df5ab Fixing more documentations. 2011-08-18 22:31:00 -04:00
Juan Basso
16ef234180 Removing trailing spaces. 2011-08-15 23:55:08 -04:00
Juan Basso
620a65b2fc Merge branch '2.0' into 2.0-api-doc
Conflicts:
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
mark_story
c1b0eb8f21 Updating output of project task to better reflect what
happened.
2011-08-03 21:56:24 -04:00
Mark Story
cdcabc79b6 Doing some refactoring in the project task.
Adding tests for constants staying commented out when CakePHP is on the include_path.
2011-08-03 20:06:47 -04:00
Mark Story
6e2870c706 Removing APP_PATH it is always the same as APP.
Fixing a typo in index.php.
2011-08-03 20:06:47 -04:00
Mark Story
20e9015f80 Making skel files generate hard coded paths, when CakePHP
is not on the include_path, and exclude hard coded paths when it is.
2011-08-03 20:06:47 -04:00
Juan Basso
895c10af7b Adjusted some types in @param, @return and @var. 2011-07-31 22:57:17 -04:00
ADmad
b15c77ecc3 Enhancing validation messages to have placeholders. Closes #1855 2011-07-31 06:33:56 +05:30
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Juan Basso
511b480285 Reverted the change from while to if. 2011-07-28 23:33:27 -04:00
Juan Basso
a0ee8b49fe Fixed some API doc in console. 2011-07-28 22:05:29 -04:00
Majna
29e4cad99e Fix for lowercased schema folder when baking plugin skel 2011-07-28 18:57:10 +02:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Mark Story
74e2cb1507 Updating doc blocks and @package strings for Console
classes.
2011-07-25 21:46:52 -04:00
Ceeram
a025cb2e01 Adding option to ProjectTask, for setting CAKE_CORE_INCLUDE_PATH. Tests added. 2011-07-13 23:54:24 +02:00
Ceeram
e3dfec98c7 fixing regex for setting constant in test.php 2011-07-13 18:23:07 +02:00
Jose Lorenzo Rodriguez
eaa80bbced Completing support for extracting model validation messages from application plugins 2011-07-07 02:11:48 -04:30
Jose Lorenzo Rodriguez
d2519ae0ae Adding support to the extract task to operate on a single plugin, thus removing the hassle of declaring the plugin path in command line 2011-07-07 01:57:55 -04:30
Jose Lorenzo Rodriguez
765164f33b Merge branch '2.0-extract-model-validation' into 2.0 2011-07-07 01:05:39 -04:30
Mark Story
91a1cf81f3 Merge branch '1.3' into merger
Conflicts:
	app/Config/acl.ini.php
	app/config/database.php.default
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	cake/basics.php
	cake/bootstrap.php
	cake/config/paths.php
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/bake.php
	cake/console/libs/i18n.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/testsuite.php
	cake/console/templates/default/classes/test.ctp
	cake/console/templates/default/views/home.ctp
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/views/elements/email/text/default.ctp
	cake/console/templates/skel/webroot/css.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cake_session.php
	cake/libs/configure.php
	cake/libs/controller/component.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/error.php
	cake/libs/magic_db.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_behavior_class.ctp
	cake/libs/view/errors/missing_behavior_file.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/bake.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/console/libs/tasks/db_config.test.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/plugin.test.php
	cake/tests/cases/console/libs/tasks/project.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/console/libs/tasks/view.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/media.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/reporter/cake_base_reporter.php
	cake/tests/lib/reporter/cake_cli_reporter.php
	cake/tests/lib/reporter/cake_text_reporter.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/libs/library.php
	cake/tests/test_app/libs/log/test_app_log.php
	cake/tests/test_app/plugins/test_plugin/config/load.php
	cake/tests/test_app/plugins/test_plugin/config/more.load.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
	cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Console/cake.bat
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/test_app/View/Emails/html/custom.ctp
	lib/Cake/Test/test_app/View/Emails/text/custom.ctp
	lib/Cake/TestSuite/templates/header.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
2011-06-23 12:48:06 -07:00
Jose Lorenzo Rodriguez
d54f8dc07a Fixing some shell tests when that fail when they are run in window 2011-06-21 11:24:59 -04:30
Jose Lorenzo Rodriguez
41603cacb7 Fixing Fixture generation task to be more compatible with SqlSrv 2011-06-20 19:03:00 -04:30
Jose Lorenzo Rodriguez
33c74b6062 Implementing validation domain extraction in the ExtractionTask 2011-06-20 00:36:31 -04:30
Juan Basso
1c7d54eacc Updated the paths from comments. 2011-06-19 20:28:40 -04:00
Juan Basso
21348169fa Camelized templates folder. 2011-05-30 23:02:39 -04:00
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Renan Gonçalves
ed96936ea7 According to CakePHP conding styles, methods prefixed by _ are protected. Changing where it makes sense and don't break anything. 2011-05-30 22:26:42 +02:00
Renan Gonçalves
438050dcaa Adding 'public' visibility to all public methods. 2011-05-30 22:02:32 +02:00
Renan Gonçalves
d0af5c78d5 Fixing the path used to create fixtures. 2011-05-30 21:04:38 +02:00
Renan Gonçalves
f55fa4d026 Removing the specific getPath() method, it was giving the same result as the parent one. 2011-05-30 20:52:58 +02:00
ADmad
c5a2efc5dd Merge pull request #103 from tPl0ch/2.0-bake-controller
2.0 Shell - Wrong underscore naming of Shells and Tasks
2011-05-29 04:56:40 -07:00
Thomas Ploch
a80d82e4a0 Fixed Shell naming from using Inflector::underscore() to Inflector::camelize(). Added small test case for Shell naming. Fixed missing CakePlugin::load() call in ShellTest. 2011-05-29 12:32:30 +02:00
Jose Lorenzo Rodriguez
93ac47fa60 Adding ability to ExtractTask to inspect models and extract the validation messages from them 2011-05-27 22:18:56 -04:30
Jose Lorenzo Rodriguez
991501d489 Implementing a new option 'exclude-plugins' from the ExtractTask 2011-05-27 15:55:50 -04:30
Ceeram
5f97292648 Change case of Controller::$plugin, fixing missing plugin exceptions, tests updated. Also removing no longer needed camelize() calls 2011-05-26 15:31:40 +02:00
Juan Basso
2ea5be5de2 Merge branch '2.0-mssql' into 2.0 2011-05-24 00:07:56 -04:00
Juan Basso
39320ef352 Renamed the Mssql driver to Sqlserver. 2011-05-22 23:19:13 -04:00
mark_story
87bccdafe6 Updating PluginTask to filter out paths that don't exist, and not offer
them as options for baking plugins into.  Fixes #1723
2011-05-22 22:04:08 -04:00
mark_story
85752e21c1 Removing undefined variable use.
Making the plugin path match the old plugins directory.
2011-05-22 22:04:08 -04:00
Ceeram
95a5b99b0e Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-05-22 23:36:48 +02:00
Ceeram
661a0cca23 removing DS, App::core('Console') already ends with DS 2011-05-22 23:29:17 +02:00
mark_story
1d687214e9 Fixing ViewTask so it creates properly cased directories for 2.0.
Fixes #1725
2011-05-22 14:42:43 -04:00
mark_story
4d76840d44 Fixing 'no' option when baking projects. Replying no, will enter
iteractive mode now.  Fixes #1721
2011-05-22 08:56:19 -04:00
mark_story
2b20eb8999 Fixing issues with ProjectTask and absolute paths.
Fixes #1720
2011-05-22 08:49:51 -04:00
Heath Nail
e645fa7340 Make baked plugin directories consistent with 2.0 conventions. 2011-05-19 13:06:12 -04:00