Seth Tanner
47bf98cae4
refs # 7929 refactor uuid support to not break Backward Compatibility
2016-01-15 11:43:01 -08:00
mark_story
707915e693
Merge branch '2.7' into 2.8
2015-10-15 22:10:56 -04:00
Marc Würth
de8aed534f
Add false as return value of field()
...
+ improve DocBlocks
2015-10-08 16:31:01 +02:00
mark_story
ae83e197dc
Merge branch '2.8' of github.com:cakephp/cakephp into 2.8
2015-09-27 11:13:12 -04:00
Mark Story
12f5aee5a2
Merge pull request #7447 from ravage84/2.7-lib-improvements
...
Various improvements to the CakePHP lib files
2015-09-25 12:14:00 -04:00
Marc Würth
e690662f0e
Various improvments to the CakePH Plib files
...
Mostly CS, doc blocks and explicit returning nulls.
2015-09-25 17:11:20 +02:00
Mark Scherer
81cbb52f74
Only array-wrap 'order' if it's not already an array.
2015-09-22 13:04:28 +02:00
mark_story
60d7bbaa10
Always update updated/modified columns when a fieldList is used.
...
When a fieldList is used, and updated is not in the fieldList, the
column should continue to be updated even if the column has a value from
the user. Because the field is not in the fieldList, we must assume that
the intent is for the field to update automatically, as it would have if
the updated column was not present in the save data.
Refs #7076
2015-09-05 22:01:33 -04:00
James Tancock
fdb41e01bb
Alter Model::exists() to return false with no table
2015-08-18 13:07:30 +01:00
James Tancock
90a77f6ce5
Alter model exists to consider useTable
2015-08-16 19:06:12 +01:00
mark_story
c6e5026767
Fix issues saveMany & saveAssociated with boolean values.
...
For non-atomic, save operations that include models with boolean fields.
The first false value would cause the save to abort. This regression was
introduced in #6947 . Instead of checking the data from save() we should
be boolean casting save() to capture the success/failure.
Refs #7069
2015-07-22 00:41:10 -04:00
mark_story
59a18e7709
Merge branch '2.6' into 2.7
2015-07-07 22:05:56 -04:00
hiromi2424
deb62c8887
#6935 Fix deep saving for hasMany could not handle validation errors correctly
2015-07-04 06:10:58 +00:00
Mark Scherer
4f3602ad5f
Adjust bake, docblocks and tests for notBlank.
2015-05-17 22:27:16 +02:00
mark_story
8cadb553d7
Merge branch 'master' into 2.7
2015-03-14 22:08:53 -04:00
Marc Würth
4f9d764fc2
Fixed link to cookbook
2015-03-11 11:27:30 +01:00
mark_story
0b916cedbb
Merge branch 'master' into 2.7
2015-03-09 21:55:20 -04:00
mark_story
a9519d39f7
Fix whitelist being empty during afterSave.
...
whitelist should only be reset after afterSave event.
Refs #6028
2015-03-08 13:51:46 -04:00
Mark Story
35e0dc2bbd
Merge pull request #5760 from cakephp/master
...
Merge master into 2.7
2015-01-27 20:48:15 -05:00
Ceeram
9ce75e6fd6
No need to get the datasource if column is defined in schema. Fixes #5712
2015-01-22 00:46:55 +01:00
mark_story
ac9a212d44
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/Utility/String.php
2015-01-11 15:25:18 -05:00
antograssiot
c2f298a8b7
Replace our custom code fence with markdown standard fence
2015-01-09 13:47:25 +01:00
euromark
52ecccb1a2
App::uses and usage replacements for String => CakeText.
2015-01-05 01:00:57 +01:00
mark_story
4d6611b328
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-12-17 21:38:32 -05:00
euromark
e1c128bb99
Consolidate with conditions sniff.
2014-12-09 03:17:35 +01:00
mark_story
ad2d6edda9
Merge branch 'master' into 2.6
2014-12-06 21:28:59 -05:00
Guy Warner
327fcb4846
Fix some missed doc block issues
2014-11-30 14:50:11 -07:00
Guy Warner
fb61d9393b
Add @trigger doc blocks of methods triggering CakeEvent
2014-11-30 14:45:40 -07:00
mark_story
decce4daf2
Merge branch 'master' into 2.6
2014-11-14 21:25:09 -05:00
watermark
8712dc01df
Cleanup of isUnique
...
isUnique takes the count of the args multiple times. Store the count in a variable to cut down on overhead.
2014-11-11 16:13:16 -05:00
mark_story
0e4fb9d648
Merge branch 'master' into 2.6
2014-11-07 15:13:46 -05:00
mark_story
dac8b7b644
Update return type for Model::saveField().
...
Fixes #5086
2014-11-05 20:37:43 -05:00
euromark
768f2c809c
Correct doc block return types.
2014-11-05 13:03:27 +01:00
mark_story
87fcc9f0b9
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-10-13 21:11:38 -04:00
mark_story
50b3893e65
Make rule sniff less complicated and tidy up doc block.
...
Refs #4871
2014-10-13 17:59:31 -04:00
Rachman Chavik
dcb605c700
Possible fix for isUnique backward compatibility
2014-10-13 19:46:10 +07:00
mark_story
39011cd9d8
Fix Model::isUnique() not working as a validator.
...
While it *did* work for single fields, isUnique could not be used to
validate the uniqueness across multiple fields as documented. Because
validation methods pass arguments in an order the validator did not
expect the validation method would not work correctly.
Fixes #4571
2014-10-09 22:49:17 -04:00
suzuki86
e4c0dee6ee
Fix small typo
2014-10-08 23:37:38 +09:00
ADmad
3fb252ad2f
Merge branch 'master' into 2.6
2014-09-13 00:37:16 +05:30
euromark
04ef39217f
Take care of more int casts.
2014-09-10 16:29:23 +02:00
José Lorenzo Rodríguez
b5bfbfcf15
Merge pull request #4223 from chinpei215/2.6-issue2529-fix
...
Fix different format of $results in afterFind
2014-09-03 10:39:37 +02:00
mark_story
7c316bbc56
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/basics.php
2014-08-30 21:28:11 -04:00
Jeremy Harris
2dac6d29c2
Clearing HABTM (unique) when HABTM array is empty, refs #2461
2014-08-28 17:52:13 -05:00
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
mark_story
9c3089796f
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/Model/Model.php
2014-08-08 23:28:06 -04:00
chinpei215
cb376bf420
Add some more transaction tests
...
And remove 2 else clauses.
2014-08-03 22:34:11 +09:00
chinpei215
799500ce6d
Fix transactions do not get rollbacked in saveAssociated/saveMany
...
Refs #2849
2014-08-02 10:12:33 +09:00
Ceeram
02b8bce641
Fix cs error introduced after resolving merge conflict with master to 2.6
2014-07-21 14:01:43 +02:00
mark_story
051d78c1a5
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/Model/Model.php
2014-07-16 23:11:58 -04:00
chinpei215
ace30fdd8a
Fix a race condition problem
...
Prevents Model::save() from generating a query with WHERE 1 = 1 on race condition.
Refs #3857
2014-07-12 23:27:39 +09:00
