Commit graph

969 commits

Author SHA1 Message Date
mark_story
2020675078 Merge branch '1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:47:27 -04:00
mark_story
cd8dff362d Merge branch '2.0-phpunit' into 2.0
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/controller/components/email.test.php
2010-06-28 22:31:35 -04:00
mark_story
35d232f08f Updating documentation in app/core.php to match historical values.
Updating skel/core.php to reflect current core.php.
2010-06-27 12:50:03 -04:00
mark_story
139c377e09 Updating help for testsuite shell.
Updating testsuite shell interface so it takes fewer arguments.
Making -coverage an option instead of a positional argument.
2010-06-26 14:20:34 -04:00
mark_story
e9ba86b9e6 Fixing typo and implementing -filter in testsuite shell. Fixes #211 2010-06-26 14:07:38 -04:00
mark_story
bd43866f5b Removing commented code and code never used anymore. 2010-06-26 13:58:49 -04:00
mark_story
b4c061b477 Testsuiteshell now runs again with PHPUnit tests. 2010-06-26 13:49:21 -04:00
mark_story
929bb5769e Merge branch '1.3' into 2.0
Conflicts:
	app/webroot/index.php
	cake/console/templates/skel/webroot/index.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/model_behavior.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
mark_story
9ace0100ab Updating ExtractTaskTest to pass under PHPUnit. 2010-06-20 23:23:56 -04:00
mark_story
dad4b5ae5c Updating DbConfigTask to PHPUnit.
Making protected methods and properties protected for easier mocking.
2010-06-08 22:14:48 -04:00
mark_story
94fc492623 Correcting how ExtractTask collects files. Test added. Fixes #775 2010-06-06 22:39:04 -04:00
mark_story
8d8fce4429 Fixing template task path replacements under windows. Fixes #771 2010-05-31 21:26:55 -04:00
mark_story
fc79dc6232 Merge branch '2.0' into 2.0-phpunit
Conflicts:
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/code_coverage_manager.php
2010-05-30 22:13:09 -04:00
Mark Story
ca5fb9fb93 Fixing tests broken by changes in default bake templates.
Fixing issue where admin methods wouldn't be correctly generated.
Fixes #664
2010-05-30 00:11:37 -04:00
predominant
8decc683ac Numerous 'shoer description' documentation entries updated to contain useful comments. 2010-05-30 01:20:28 +10:00
predominant
f06f0dae8b Numerous "Enter description here" block comments updated to have meaningful descriptions. 2010-05-30 01:10:48 +10:00
mark_story
8ac46c3b63 Adding return from _stop() to help testing.
Updating tests for getName()
2010-05-26 21:59:56 -04:00
mark_story
265609dfc1 Moving test to work with PHPUnit.
Fixing incorrect count amount in SchemaShell.
2010-05-23 00:17:22 -04:00
mark_story
89a8ef3871 Updating API shell to use reflection as the regular expression was not working with visibility keywords.
Updating tests for changes in output.
Updating tests to work with PHPUnit.
2010-05-22 22:09:07 -04:00
mark_story
78653347b2 Removing request time output from index.php. Makes non sgml requests like json easier to do. Fixes #720 2010-05-20 23:13:45 -04:00
predominant
6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
Juan Basso
a94b9ee95b Update various links. Closes #392 2010-05-18 22:15:13 -03:00
mark_story
cd5aee1bfa Applying patch from 'franiglesias'. Fixes issues where str_replace would greedily replace too many occurences of 'libs/'. Fixes #724 2010-05-16 23:50:17 -04:00
Mark Story
96d0119abc Applying patches from 'wals' to fix uses where incorrect parameters were being passed into methods, and making methods match their documentation blocks. Fixes #668 2010-05-10 23:58:22 -04:00
Mark Story
91a40a0104 Making null check explicit so falsey default values can be used. Fixes #695 2010-05-10 23:46:47 -04:00
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
Mark Story
45d052b55a Fixing failing tests in ViewTask test case, caused by changes in core templates.
Fixing incorrect variable usage where models would be double singularized causing incorrect names.  Fixes #668
2010-05-06 21:38:14 -04:00
Mark Story
5ea4f027db Fixing TestTask so that if you give an invalid class type you get an error. 2010-05-06 07:31:52 -04:00
Mark Story
918e961f7d Fixing typo in testtask. Fixes #659 2010-05-04 23:29:54 -04:00
Mark Story
fcad9b464c Fixing tests broken by changes in default bake templates.
Fixing issue where admin methods wouldn't be correctly generated.
Fixes #664
2010-05-04 23:27:41 -04:00
Jose Diaz-Gonzalez
1180f66cc0 Setting $actions to null so that the controller methods are not always based upon the first controller in an app/plugin.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-02 20:35:19 -04:00
Mark Story
adf604a966 Merge branch '1.3' into 2.0
Conflicts:
	cake/console/templates/default/actions/controller_actions.ctp
	cake/console/templates/default/views/form.ctp
	cake/console/templates/default/views/index.ctp
	cake/console/templates/default/views/view.ctp
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
2010-05-02 17:53:42 -04:00
Mark Story
6d092552e5 Updating bake templates and Scaffold to use less sprintf() and more complete sentences in i18n strings. This should make translations easier to do in a gender correct way. Fixes #210 2010-04-28 23:56:07 -04:00
Mark Story
afa0e6b8f9 Adding cake.icon.png to the skel dir. Fixes the wrong asset being included when new projects are generated. Fixes. #637 2010-04-27 23:19:55 -04:00
Mark Story
02c56ba8c1 Updating visibility in the various bake tasks. 2010-04-23 21:57:59 -04:00
Mark Story
854583f0d7 Fixing visibility on ModelTask and making a private method protected. 2010-04-23 21:49:35 -04:00
predominant
015872445b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/acl.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
2010-04-23 12:52:56 +10:00
Mark Story
568e9d3a89 Adding tests for and fixing the behavior of cake acl initdb it now correctly delegates to SchemaShell. Fixes #608 2010-04-21 23:28:40 -04:00
Mark Story
81edcdf431 Making TestTask not depend on Inflection rules for creating directory names, refs #610 2010-04-21 23:21:25 -04:00
Mark Story
120fdd9045 Removing other uses of Routing.admin as it has been removed from Router. 2010-04-20 23:43:51 -04:00
Mark Story
9053291fe4 Fixing incorrectly named variable. Refs #567 2010-04-20 22:18:17 -04:00
Mark Story
2f0255ec1a Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-18 22:19:57 -04:00
Juan Basso
4654c85937 Fixing name of cake icon on skel. Fixes #600
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-18 22:19:17 -04:00
predominant
a121e0b628 Fix missing quotation mark. 2010-04-19 12:08:04 +10:00
Mark Story
c9f3fa5faa Updating constructor. 2010-04-18 01:04:56 -04:00
ADmad
9495aa2348 Fixing incorrect function name in comments in bootstap.php of console's template 'skel'. Closes #593 2010-04-18 00:12:34 +05:30
predominant
92215e1795 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/libs/inflector.php
	cake/libs/view/helpers/text.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/helpers/time.test.php
2010-04-16 23:43:28 +10:00
predominant
c7fcaf995f Convert getMictime() php4 hack to microtime(true) 2010-04-16 02:58:28 +10:00
predominant
1e425907b2 Change Cake Console files to new use of shortcut for translations. 2010-04-16 01:43:39 +10:00