mark_story
d9484c109f
Merge branch '1.3' of github.com:cakephp/cakephp into 1.3
2010-11-22 21:29:33 -05:00
mark_story
d0d16a7eda
Fixing i18n extraction errors in Scaffold. Fixes #1305
2010-11-22 21:29:11 -05:00
mark_story
bf10723f89
Applying patch from 'michealc' to fix duplicated comments. Fixes #1306
2010-11-22 21:21:55 -05:00
mark_story
f48811a2ff
Moving include up so its not buried deep inside the class.
2010-11-22 21:15:02 -05:00
mark_story
7013a8f1e0
Fixing typo. Should be AppShell, not AppModel.
2010-11-22 21:07:21 -05:00
mark_story
244de1df85
Adding a comment about the messageId property and shells. Refs #1303
2010-11-22 13:01:14 -05:00
mark_story
2d21e9c331
Removing cache hits, as App::core() is almost always called before Cache is initialized, as Cache uses App::core to load the first configured engine. This Cache::read call can never succeed so it should be removed.
2010-11-21 23:02:39 -05:00
mark_story
fdcfd03340
Fixing typo that prevented html coverage reports from being generated.
2010-11-21 23:02:28 -05:00
mark_story
4c0e69b8fc
Removing constant checks, they aren't used anymore.
2010-11-21 15:13:33 -05:00
mark_story
8e1f7cc7b9
Removing extra line.
2010-11-21 15:12:44 -05:00
mark_story
8aabf3689e
Making BehaviorCollection more consistent with other object collections.
...
Fixing failing tests caused by not being updated when behavior changed.
2010-11-21 14:42:13 -05:00
mark_story
cb657b158b
Fixing failing test and adding skip for test that will fail in a non-isolated case.
2010-11-21 14:39:07 -05:00
mark_story
a729d29cfd
Updating ModelTask test to have fewer skips and collisions with the rest of the testsuite.
2010-11-21 13:39:18 -05:00
mark_story
d7b1f70680
Adding some additional output to bake tasks to make them more consistent. Adding flags for Quiet output so the shells give minimal output.
2010-11-21 12:55:01 -05:00
mark_story
d373dde2ef
Fixing notice errors in bake all.
...
Moving some message printing around.
2010-11-21 12:22:44 -05:00
mark_story
8a129ec3a0
Adding a normalize parameter to Object::_mergeVars(). This allows existing behavior to be maintained.
...
Updating Controller and Shell usage to match new parameters.
2010-11-21 00:47:42 -05:00
mark_story
8821bec049
Moving _mergeVars() into Object as its common to Controller, Model and Shell.
2010-11-21 00:14:29 -05:00
mark_story
8f82156a51
Adding _mergeVars to Controller (this duplicated method will be re-factored away).
...
Updating tests in ControllerMergeVarsTest to use PHPUnit assertions.
2010-11-21 00:14:29 -05:00
mark_story
e2aeae3825
Adding _mergeVars() into Model.
...
Refactoring how Model does its property merging.
Eventually _mergeVars() could be moved into Object.
2010-11-21 00:12:07 -05:00
mark_story
b80535573e
Adding _mergeVars to Shell. This allows $tasks and $uses to work much
...
like $uses in Controllers, and provides consistency in the framework.
Adding tests for merging vars.
2010-11-21 00:12:07 -05:00
mark_story
a8554df077
Fixing call to a help method that doesn't exist.
2010-11-21 00:12:07 -05:00
mark_story
cbd88ede37
Adding support for AppShell into App. When you import a Shell class, App will automatically load Shell and AppShell.
2010-11-21 00:12:07 -05:00
mark_story
a2bc369935
Fixing missing include in HelpFormatter.
2010-11-21 00:12:06 -05:00
mark_story
4f6891705b
Moving Shell test to the same path as the shell class.
2010-11-21 00:12:06 -05:00
mark_story
66c9b79c2e
Removing App::__overload() it does nothing anymore.
2010-11-21 00:12:06 -05:00
mark_story
0d7ecea6cb
Adding AppShell to the ignored shell list in CommandListShell.
2010-11-21 00:12:06 -05:00
mark_story
b914709f32
Moving AppShell to where the other shells live.
2010-11-21 00:12:06 -05:00
mark_story
b0ddfa0755
Added the placeholder class for an 'AppShell'.
...
Conflicts:
cake/console/cake.php
2010-11-21 00:12:06 -05:00
mark_story
79aafda698
Removing use of serialize() for locked fields. This removes any
...
possible exploit related to serialize()/unserialize(). Instead values
are passed as | delimited.
2010-11-21 00:09:45 -05:00
mark_story
ae7855692d
Removing unserialize() as its dangerous. Instead using | delimited fields for locked fields. This totally avoids issues with serialize(). Removing str_rot13, as its only child proof.
...
Tests updated.
2010-11-20 23:42:54 -05:00
mark_story
3237402fb8
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/configure.php
2010-11-20 23:14:33 -05:00
mark_story
ef3cb0e50c
Adding tests for Set::normalize()
2010-11-20 22:46:55 -05:00
mark_story
6d9b000aee
Changing how mergeVars are handled, so the difference of app/current is used as a base.
...
Also fixing issues where passing settings to helpers in AppController could result in them not being correctly merged.
Thanks to hashmich for the partial patch.
Fixes #1183
2010-11-20 22:34:24 -05:00
Juan Basso
3056fbf680
Changing authentication classes to use suffix Authentication instead of Method.
2010-11-20 17:47:35 -02:00
mark_story
e0a8ffe8a3
Applying patch from 'jmccaffrey' to fix issues on windows where virtual
...
machine paths would not be correctly handled. Fixes #1254
2010-11-20 13:26:30 -05:00
PhpNut
82d46067ab
Corrected doc comment.
2010-11-17 15:00:27 -06:00
PhpNut
bed7767258
Removing __cache property that can be altered outside of the class definition.
...
Adding __resetCache() as a replacement for checking if cache should be reset and written.
2010-11-17 14:02:35 -06:00
José Lorenzo Rodríguez
40418de218
Freeing up some memory in dbos after the result set has been completly fetched.
...
Adding dbo_mysql and dbo_postgres to the AllDAtabase testsuite
2010-11-16 23:59:24 -04:30
mark_story
ba10003ef2
Fixing failing tests when HtmlHelper test was run by itself.
2010-11-16 22:52:49 -05:00
José Lorenzo Rodríguez
c0f10437ea
Adding a few transactions to speed up a little tests involving fixtures
2010-11-16 23:14:48 -04:30
José Lorenzo Rodríguez
1326707c9d
Implementing transaction nesting, this will allow to open multiple transactions that will only be commited if all transactions succesfully calls commit()
2010-11-16 22:56:23 -04:30
mark_story
47f6a29998
Small optimizations in env() and Helper::_parseAttributes().
2010-11-16 22:24:54 -05:00
mark_story
d89581dcca
Changing object construction and method call to use file_put_contents.
2010-11-16 21:54:05 -05:00
mark_story
d12c232d8a
Merge branch '1.3' into merger
...
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
cake/tests/lib/cake_test_case.php
2010-11-16 21:48:13 -05:00
José Lorenzo Rodríguez
f2b707ac0b
Merge remote branch 'origin/2.0' into feature/2.0/pdo
...
Conflicts:
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
2010-11-16 21:54:42 -04:30
mark_story
5349257bbd
Changing empty() to !isset() to avoid additional cache hits when po files are missing or empty.
2010-11-16 07:32:14 -05:00
José Lorenzo Rodríguez
a335891eba
mapping lastNumRows to lastAffectedRows as it is not possible to do the first one using PDO
2010-11-16 02:02:08 -04:30
José Lorenzo Rodríguez
5a881c461e
Fixing acl testcase so it runs smoothly on postgres
2010-11-16 01:22:29 -04:30
mark_story
f0ac462775
Updating test cases with failing tests.
2010-11-15 22:53:49 -05:00
mark_story
66e6ec763e
Merge branch 'dispatcher-request' into 2.0
...
Conflicts:
cake/libs/configure.php
cake/tests/cases/libs/all_routing.test.php
cake/tests/cases/libs/controller/controller.test.php
2010-11-15 22:42:54 -05:00
