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
|
9e4c890082
|
Updating the schema command in the core.php files to reflect the correct command needed for 1.3. Fixes #1031
|
2010-09-23 23:12:20 -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
|
e4d34b640b
|
Merge branch '2.0-exceptions' into 2.0
Conflicts:
cake/libs/error.php
cake/tests/cases/libs/controller/scaffold.test.php
cake/tests/cases/libs/error.test.php
|
2010-09-10 20:31:16 -04:00 |
|
mark_story
|
bdb3feb7fd
|
Adding stack trace to the console error handler. Updating tests.
Changing require to require_once so the test case for ConsoleErrorHandler doesn't blow up in cli.
|
2010-09-08 23:38:51 -04:00 |
|
mark_story
|
6e5e32bef5
|
Updating AclShell test to use AclComponent correctly.
|
2010-09-07 23:40:07 -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
|
b491414a51
|
Changing gif to png, so baked apps have the correct icon. Fixes #1081
|
2010-09-06 01:39:39 -04:00 |
|
Mark Story
|
2e46d2f5ca
|
Changing gif to png, so baked apps have the correct icon. Fixes #1081
|
2010-09-06 01:38:31 -04:00 |
|
Mark Story
|
8bd0f18a53
|
Adding a new line to the ConsoleErrorHandler
Refactoring ConsoleErrorHandler test to use dynamic mocks.
|
2010-09-05 11:22:39 -04:00 |
|
Mark Story
|
9fee81cda0
|
Updating ConsoleErrorHandler to use new exception names and method renames.
|
2010-09-05 11:10:48 -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
|
a1e01e414b
|
Adding a tests for CakeExceptions and non CakeExceptions
|
2010-09-02 18:02:58 -04:00 |
|
Mark Story
|
a44b35311d
|
Integrating the ConsoleErrorHandler into the console environment.
|
2010-09-02 17:49:43 -04:00 |
|
Mark Story
|
60e44660c3
|
Moving ErrorHandler to ConsoleErrorHandler so it doesn't have classname conflicts.
Making the console use a subclass of ErrorHandler.
|
2010-09-02 17:49:00 -04:00 |
|
Mark Story
|
034aaa7462
|
Creating optional boot variable that informs Configure if it should bootstrap the app. Changing how ShellDispatcher checks for app existence it sets the $boot var now and reuses the framework bootstrap file instead of a second custom one.
|
2010-09-02 17:16:57 -04:00 |
|
Mark Story
|
ffa8b959e4
|
Changing classname and importing base class.
|
2010-09-02 16:47:06 -04:00 |
|
mark_story
|
a8d4015f47
|
Updating bootstrap process in CLI to match the one in web.
Updating all_libs to use new file.
Updating error_handler test to run in cli.
Updating Controller so it imports required classes.
|
2010-08-30 22:59:10 -04:00 |
|
mark_story
|
dc67b9cacc
|
Moving all the exceptions into one file for the short term.
|
2010-08-28 00:08:35 -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
|
4622ec44c2
|
Updating the skel and app test.php's to not make a global variable for the dispatcher. This dramatically improves the performance of the web test runner.
|
2010-08-16 23:33:07 -04:00 |
|
mark_story
|
f46241a6e7
|
Merge branch '2.0' into 2.0-helpers
|
2010-08-16 23:02:44 -04:00 |
|
mark_story
|
705e90bef7
|
Merge branch '1.3' into 2.0-merge
Conflicts:
cake/libs/cache/memcache.php
cake/libs/cake_session.php
cake/libs/model/behaviors/acl.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/model/behaviors/acl.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
|
2010-08-15 23:09:02 -04:00 |
|
mark_story
|
aba97d0ab2
|
Applying patch from 'Mark Mitchell' to fix auto exiting of cake.bat. Fixes #992
|
2010-08-14 18:54:12 -04:00 |
|
mark_story
|
e0acd2131f
|
Fixing ShellDispatcher tests and making ShellDispatcher/Shell use TaskCollection to loadTasks.
|
2010-08-10 23:18:41 -04:00 |
|
mark_story
|
9804ed0cb3
|
Adding tests for loading plugin files.
|
2010-08-10 23:18:41 -04:00 |
|
mark_story
|
457f24d882
|
Adding TaskCollection, much like Helper and Component collection TaskCollection will be used to reduce global space pollution.
|
2010-08-10 23:18:41 -04:00 |
|
mark_story
|
d1028a7434
|
Applying patch from 'Mark Mitchell' to make cake.bat return the exit code of the called cake shell. Fixes #992
|
2010-08-10 23:12:55 -04:00 |
|
mark_story
|
f5bf4c5552
|
Changing config value name to more accurately represent what it does.
|
2010-07-27 22:27:43 -04:00 |
|
mark_story
|
5673ceb816
|
Updating core.php files with new session configuration.
|
2010-07-27 22:27:42 -04:00 |
|
mark_story
|
d38857095a
|
Merge branch '1.3' into 2.0
Conflicts:
cake/libs/model/model.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/tests/cases/libs/controller/components/session.test.php
|
2010-07-24 22:34:42 -04:00 |
|
mark_story
|
b5d7f6447f
|
Applying patch from 'asavoy'. Changing schema shell so that schema files generated for plugins have the classname of PluginSchema instead of AppSchema. Tests updated. Fixes #922
|
2010-07-23 21:46:06 -04:00 |
|
Scott Reeves
|
1774530222
|
Fixing typo in method description.
Signed-off-by: mark_story <mark@mark-story.com>
|
2010-07-19 23:14:28 -04:00 |
|
José Lorenzo Rodríguez Urdaneta
|
478cbd0a60
|
Adding test case for TestSuiteShell and refactoring to ease this testing
|
2010-07-13 21:28:21 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
1c08d48652
|
Showing the available testcases when the testsuite shell is run with no params
|
2010-07-13 20:23:45 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
ab6e3eecd9
|
Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit
Conflicts:
cake/console/libs/testsuite.php
|
2010-07-13 20:22:40 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
7f7de13905
|
Improving the help screen in the testsuite shell
|
2010-07-13 20:20:19 -04:30 |
|
mark_story
|
fb3c3a6413
|
Removing non functional -coverage option from the help
Removing now dead code.
Adding support for documented -filter option.
|
2010-07-13 20:15:25 -04:00 |
|
José Lorenzo Rodríguez Urdaneta
|
01cfe32667
|
Adding a test case list to the test suite cli runner
|
2010-07-12 23:24:59 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
d5c51b9b09
|
Fixing notices introduced in last commit
|
2010-07-07 23:03:24 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
7b51feb89c
|
Fixing constant declaration as it was not consistent in web runner and cli runner
|
2010-07-07 22:58:48 -04:30 |
|
José Lorenzo Rodríguez
|
1b97af2e34
|
Making necessary changes to use the PHPUnit cli tool in testsuite shell
|
2010-07-07 00:11:06 -04:30 |
|
José Lorenzo Rodríguez
|
21ffdb0ab9
|
Starting to refactor testsuite shell to use the PHPUnit Cli runner
|
2010-07-07 00:07:22 -04:30 |
|
mark_story
|
b8085cddce
|
Removing PHP5 and all its uses.
|
2010-07-05 22:19:22 -04:00 |
|
mark_story
|
2fee0b5b63
|
Updating console bootstrap process.
|
2010-07-04 22:03:25 -04:00 |
|
mark_story
|
999a878d68
|
Removing closing ?> on bake templates so they match the rest of CakePHP.
|
2010-07-01 18:19:37 -04:00 |
|
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 |
|