chinpei215
c246695518
Fix different format of $results in afterFind
...
Refs #2529
As of this commit, we can get consistent format of $resutls in afterFind.
And we can keep backward compatibility if Model::$useConsistentAfterFind is set to false.
2014-08-11 01:19:40 +09:00
euromark
974ca851c2
Correct doc blocks according to cs guidelines.
...
Remove superfluous empty lines.
2014-07-03 15:36:42 +02:00
euromark
0ece694a75
microptimize options and default merge and other string key array merges
2014-04-08 01:25:14 +02:00
Jose Lorenzo Rodriguez
343d3279b9
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2014-04-06 21:50:41 +02:00
euromark
0d09a54033
more missing doc block tags added
2014-04-02 03:02:37 +02:00
mark_story
c1ab6fa9d1
Merge branch 'master' into 2.5
2014-01-30 10:13:37 -05:00
joostdekeijzer
827c815cf1
correct property comment
2014-01-29 12:25:09 +01:00
ADmad
dda6080579
Merge branch 'master' into 2.5
2013-11-19 00:27:12 +05:30
Marc Würth
7cfa0116f4
Removed "PHP 5" from file header DocBlocks
...
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
Jose Lorenzo Rodriguez
9673048c30
Merge branch 'master' of github.com:k-halaburda/cakephp into k-halaburda-master
2013-10-12 01:03:20 +02:00
euromark
382f75dbfc
cs corrections, bool to boolean and int to integer.
2013-09-17 14:44:34 +02:00
Ber Clausen
867d4b312d
Update afterSave() callback signature to be PHP5.4+ compliant.
2013-09-09 21:34:11 -03:00
Ber Clausen
c524645738
Update Model/Behaviors callback signature to be PHP5.4+ compliant.
2013-09-05 11:17:02 -03:00
euromark
036954b52d
remove duplicate newlines according to CS
2013-08-20 20:27:06 +02:00
k-halaburda
9536b3cacd
Successfully
2013-08-19 08:11:45 +02:00
k-halaburda
2166b397bc
Successfully
2013-08-18 17:43:26 +02:00
k-halaburda
2a27b37a43
New line on end
2013-08-18 17:37:34 +02:00
k-halaburda
180ecb7929
Fixed some formatting
2013-08-16 10:02:11 +02:00
k-halaburda
f5daf1c8aa
Fixed some formatting
2013-08-16 09:51:01 +02:00
k-halaburda
d7dab3282f
Remove added fixtures and use existing. Updated one old test to add data from afterFind callback
2013-08-16 09:28:32 +02:00
k-halaburda
1d9bce34d4
Formatting issues
2013-08-13 13:01:38 +02:00
k-halaburda
39b202a4a9
Added some tests to related models afterFind callback
2013-08-13 10:04:17 +02:00
k-halaburda
8e40a3a3d3
Added some tests for related models afterFind callback
2013-08-13 09:29:14 +02:00
euromark
ba02678693
doc block corrections
2013-07-05 16:17:23 +02:00
euromark
394bf1054d
remove name attribute where not necessary, clean up doc blocks
2013-06-08 04:29:08 +02:00
Marc Würth
4c9f0414cb
Improved the DocBlocks and other code cleanup
...
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Rik van der Heijden
dddf8aafb9
Fixed curly brackets at a few class definitions
2013-05-04 13:23:58 +02:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01:00
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
mark_story
4af6039107
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
mark_story
7790bcacff
Allow afterFind() to fully remove an associated record.
...
By returnning array() or unsetting the 0'th result an afterFind
callback should be able to fully remove data from the results.
Fixes #3541
2013-01-17 20:35:37 -05:00
euromark
11a88042bd
fix doc block endings
2013-01-11 15:06:54 +01:00
mark_story
728300786b
Merge branch 'master' into 2.3
2012-08-30 19:43:11 +01:00
Jose Lorenzo Rodriguez
60eb228ddf
Fixing issues with validation rules not being reset after calling
...
create() on the model or when calling validates() multiple times
This had interesting side effects when deep saving
2012-08-25 13:29:16 +02:00
Christopher Vrooman
bbd0b9dd8b
Tweaked DocBlocks
...
Set property and return to boolean for DocBlocks of the CallbackPostTestModel class.
2012-08-03 22:40:28 -04:00
mark_story
eb7b66b37c
Revert default value of allowEmpty.
...
In 2.1, the default value was null, which does not impart any behavior.
In 2.2 this was changed to false, which makes it hard to validate ''
with validation methods. Move some tests around and update tests that
probably should have been failing before.
Fixes #2983
2012-06-24 20:06:14 -04:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
Ceeram
7dbd6bc3a2
make sure model data is moved to alias, even when first key in data is assoc model
...
add extra tests for saveAll and validate first
ensure db values dont get reset to default values
2012-05-19 14:41:16 -04:30
Rachman Chavik
73c66e2df4
fixing method signature in test models
2012-05-10 19:47:10 +07:00
Jose Lorenzo Rodriguez
0fb025f6dc
Fixing error with validateMany and validateAssociated not saving values altered in beforeValidate callbacks
2012-05-09 23:51:27 -04:30
mark_story
6c5255ac73
Fix saving translate records with saveAll()
...
Also fixes issues saving translated data with validation
disabled. By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.
Fixes #2857
2012-05-06 22:48:15 -04:00
José Lorenzo Rodríguez
d80b1ef7f6
Merge pull request #630 from shama/patch-typos
...
Typos in Test Cases
2012-04-27 07:42:40 -07:00
Kyle Robinson Young
eb059d3fa6
Fix typos in test cases
2012-04-26 20:14:52 -07:00
Kyle Robinson Young
b8488b8dfe
Update 1.x @link in docblocks
2012-04-26 19:49:18 -07:00
ADmad
93639a7c43
Fixed bug where associated model's afterfind was not triggered in particular case
2012-04-04 19:48:37 +05:30
mark_story
dbb2dd44d7
Fix more coding standards.
2012-03-18 21:20:33 -04:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
Ceeram
08a4d0bf63
Avoid unsetting Model's $findMethods when defining a custom find method in AppModel, also add tests for custom finds
2012-03-03 23:55:03 +01:00
mark_story
7665f369fa
Merge branch '2.1-type-hinting-corrections' into 2.1
2012-02-25 20:07:18 -05:00
