mark_story
f847080cbf
Changing more php version strings.
2010-10-03 12:46:03 -04:00
mark_story
94d738e834
Fixing failing tests and group test situational fails in console tests. Adding console tests to all tests.
2010-09-24 23:30:02 -04:00
mark_story
f21161ef46
Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
...
differences upon merging.
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/libs/cache/file.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/i18n.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
mark_story
e91fa68f8e
Making the set() functions use + instead of array_merge() so that numeric indices are properly preserved across multiple method calls. Fixes #1105
2010-09-18 00:13:03 -04:00
Mark Story
d88da3d579
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/configure.php
cake/libs/model/connection_manager.php
cake/libs/model/model.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
cake/tests/cases/libs/view/helpers/text.test.php
2010-09-06 16:53:04 -04:00
Mark Story
5c0fe1b16e
Applying patch from 'majna'. Adding plugin to the list of template variables exposed in the controller task. Test added Fixes #1077
2010-09-03 12:33:59 -04:00
mark_story
c48c0d6295
Fixing issue where ViewTask would make empty view files for actions that did not have templates. Test case added. Fixes #1040
2010-08-23 21:49:30 -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
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
mark_story
8ac46c3b63
Adding return from _stop() to help testing.
...
Updating tests for getName()
2010-05-26 21:59:56 -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
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
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
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
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
predominant
1e425907b2
Change Cake Console files to new use of shortcut for translations.
2010-04-16 01:43:39 +10:00
predominant
50a547167b
Changing protected methods to specify protected access.
2010-04-05 13:21:28 +10:00
predominant
1497ec3910
Changed all public methods to specify public access.
2010-04-05 13:19:38 +10:00
predominant
850ca02bb6
Changed all public 'var' declarations to be 'public $var'
2010-04-04 17:14:00 +10:00
predominant
329a13fe5f
Changed all $_ declared variables to protected.
2010-04-04 16:36:12 +10:00
predominant
29dc12dbc2
Changed all $__ declared variables to private.
2010-04-04 16:33:39 +10:00
Mark Story
1230b83438
Fixing incorrect string concatenation resulting in invalid conditions. Fixes failing tests.
2010-03-22 22:26:32 -04:00
Mark Story
49c60658b9
Fixing the ability to use regular expressions for validation rules. Fixes #453
2010-03-13 19:44:20 -05:00
Mark Story
8e8acfaccd
Fixing notice errors when bogus validation options are selected. Refs #453
2010-03-12 22:58:14 -05:00
Mark Story
f8bc6de4ae
Fixing ViewTask and FixtureTask. $interactive was set to false, and methods were auto quitting. Fixes #437
2010-03-08 21:18:53 -05:00
Mark Story
12edc75a4f
Moving output below check for a single prefix.
2010-03-07 17:14:13 -05:00
Mark Story
220fba9bba
Fixing inflection of parameters when using bake. Model, View, Controller, and Fixture tasks all accept either singular or plural forms of the table name. Fixes #425
2010-03-05 21:30:58 -05:00
Mark Story
f8cb20e994
Passing interactive property to inner tasks. Inner tasks now share the parent interactive setting making things more consistent. Fixes #423
2010-03-04 22:02:49 -05:00
Mark Story
d4393e9058
Fixing path generation in BakeTask.
...
Removing name properties as they were causing troubles.
All BakeTasks are now interactive = false by default. This makes interfaces more consistent when working with bake. Refs #423
Tests updated.
2010-03-04 21:57:48 -05:00
Mark Story
01ea34f452
Moving features up to BakeTask.
2010-03-04 21:30:26 -05:00
Mark Story
4a6ab01134
Making model, view, and controller task use BakeTask.
2010-03-04 20:52:25 -05:00
Mark Story
1af49c8780
Adding BakeTask. Will be a base class for tasks used in Bake.
2010-03-04 20:50:52 -05:00
Mark Story
748ec4ee78
Fixing baking views for models in plugins. Making sure that the temporary controller object gets its plugin property set so the correct models are loaded and used. Fixes #381
2010-02-27 20:28:04 -05:00
Mark Story
1c7c748a7c
Merge branch 'view-all' into 1.3
2010-02-21 22:29:22 -05:00
