Commit graph

6787 commits

Author SHA1 Message Date
Mark Story
e1b0c41254 Making Model::isVirtualField() and Model::getVirtualField() work with both Model.field as field. This fixes a number of issues in conditions, and fields arrays when model aliases are used. Fixes #208 and #220 2010-01-19 09:22:13 -05:00
tPl0ch
49ad582759 Fixes #222 . Fixed ShellDispatcher constructors to not issue warnings on PHP5.3 with E_STRICT
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-19 09:19:21 -05:00
Mark Story
9f8e0e163e Removing getTests included by accident. 2010-01-18 21:59:18 -05:00
Mark Story
9b3a2fd658 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-18 21:57:46 -05:00
Mark Story
080e34718d Minor refactor, and adding tests from previous commit. Fixes #208 2010-01-18 21:57:03 -05:00
AD7six
7943f3d168 allowing vritual fields to work whether specified with a model alias or
not. by concequence allows find('list', array('fields' => array('id',
'virtual'))) to work
2010-01-18 21:54:15 -05:00
Mark Story
06ba7ac828 Adding omitted default route, and test cases to test its functionality. Fixes #212 2010-01-18 10:05:23 -05:00
Mark Story
24c0883fad Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-18 09:22:50 -05:00
Juan Basso
d60a66f16b Separate the variables of internationalized strings in controllers of cake bake.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-18 01:10:31 -05:00
Juan Basso
473e07a674 Putting __() in strings that missing internationalization.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-18 01:06:25 -05:00
Juan Basso
0ac99eddb5 Replacing "echo sprintf" by "printf" where possible. Fixes #209.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-18 00:56:22 -05:00
Mark Story
07234c930a Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-16 23:52:28 -05:00
Mark Story
668a791171 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-16 22:50:57 -05:00
predominant
ab666f8ea7 Revert "Adjusting EmailComponent Boundary creation to occur for all generated email. Fixes #14."
This reverts commit b50b5922fd.
2010-01-17 14:50:09 +11:00
Mark Story
1f6bc5613d Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-16 21:27:42 -05:00
Mark Story
f10d7dde75 Updating version numbers. to 1.3.0-beta 2010-01-16 20:38:08 -05:00
Mark Story
5203397a6a Adding error expectation to model_write test. Models using useTable = false, will still issue count queries to their datasources when exists() is called. 2010-01-16 20:24:27 -05:00
Mark Story
3be28fc749 Fixing errors in CakeTestCase::testAction tests case caused by changes in test suite not always forcing an output parameter. 2010-01-16 20:18:20 -05:00
Mark Story
92ff9ccae0 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-16 20:15:13 -05:00
Mark Story
0e09fee3b1 Correcting timehelper tests to use correct timestamp for indicated times. Making timezone output more resilient. 2010-01-16 20:14:57 -05:00
Mark Story
f1276ce337 Fixing several issues in the CodeCoverageManager test case. 2010-01-16 20:14:16 -05:00
Mark Story
c4ef429004 Changing require to require_once to make tests less order dependent. 2010-01-16 19:41:52 -05:00
predominant
b50b5922fd Adjusting EmailComponent Boundary creation to occur for all generated email. Fixes #14. 2010-01-17 11:38:45 +11:00
Mark Story
34fed29d05 Renaming session test case.
Adding missing doc block to inflector test case.
Updating Set::map reverse test to reflect changes in Model.
Removing Inflector from lib group as the reset test breaks many other tests.
Adding a table property to the session fixture.
2010-01-16 19:19:12 -05:00
Mark Story
8cae1e850a Fixing spacing. 2010-01-16 18:50:04 -05:00
Mark Story
826dbc466f Fixing failing test caused by merge with 1.2 2010-01-16 18:26:06 -05:00
Mark Story
1acc4c879a Removing debug() from scaffold test. 2010-01-16 18:15:38 -05:00
José Lorenzo Rodríguez
1910a7f7ee Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Removing gettests from jsHelper test case.
2010-01-15 19:04:13 -04:30
José Lorenzo Rodríguez
3bd4cc07a6 Fixes to make TimeHelper and test cases more compatible with PHP 4 2010-01-15 17:48:41 -04:30
Mark Story
71254f3d5e Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-15 17:17:26 -05:00
Mark Story
476ef19fff Removing gettests from jsHelper test case. 2010-01-15 17:16:51 -05:00
ADmad
4c0a6d952f Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-16 03:34:14 +05:30
ADmad
2441849fa0 Replacing constant CIPHER_SEED with Configure class variable 'Security.cipher_seed' and renaming Security class method 'checkSessionKey' to 'checkSecurityKeys' 2010-01-16 03:26:26 +05:30
Mark Story
1f5d579ab6 Removing the ability to set layout, and viewPath with Request parameters. This feature was untested and undocumented. Furthermore, it should not be the responsibility of the dispatcher to set these parameters. 2010-01-15 16:19:23 -05:00
Mark Story
4f5ce7f94c Adding additional plugin 'shortcut' dispatching tests. 2010-01-15 16:18:19 -05:00
Mark Story
1a8c3fd405 Fixing infinite loops caused by stale caches. 2010-01-15 16:17:34 -05:00
Mark Story
813a7779e0 Removing inflections.php from skel directory. 2010-01-15 13:28:09 -05:00
Mark Story
c20aba6b9c Merge branch 'merger' into 1.3 2010-01-15 13:27:19 -05:00
Mark Story
f11068b831 Trimming trailing whitespace from files. Refs #201 2010-01-15 13:26:47 -05:00
Mark Story
40c686f5c1 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-15 11:59:43 -05:00
Mark Story
09ad7418f5 Merge remote branch 'origin/1.2' into merger
Conflicts:
	cake/console/templates/skel/config/inflections.php
	cake/libs/model/cake_schema.php
	cake/libs/model/model.php
2010-01-15 11:51:58 -05:00
Mark Story
7088afbb88 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-15 00:11:33 -05:00
Mark Story
34c4af549c Adding missing reference operators for php4 compatibility. 2010-01-15 00:09:59 -05:00
Mark Story
f1a0690415 Fixing issues in JsHelper with PHP4 compatibility. Seems passing arrays by reference doesn't work very well. 2010-01-15 00:02:24 -05:00
Mark Story
b97ac84a34 Fixing method_exists use in Validation for php4 compatibility. 2010-01-14 23:41:35 -05:00
Mark Story
276d183bdd Adding conditional to php5 only function use. 2010-01-14 23:40:18 -05:00
Mark Story
741f507c23 Fixing reference errors in php4. 2010-01-14 23:38:39 -05:00
Mark Story
371ac3971a Fixing php4 compatibility in model_read test. 2010-01-14 23:38:24 -05:00
Mark Story
3a38e0869f Fixing php4 issues in ErrorHandler and ErrorHandler testcase. 2010-01-14 23:17:24 -05:00
Mark Story
547aa76c92 Fixing method_exists() use for php4, as method_exists cannot be used with class/method names in php4. 2010-01-14 23:07:48 -05:00