Commit graph

15921 commits

Author SHA1 Message Date
U-Zyn Chua
e0eb8f8e18 Added decimal CakeSchema test case and DatatypeFixture. #3171 2013-09-28 14:29:39 +08:00
U-Zyn Chua
a1a3e70039 Decimal support for PostgreSQL. #3171 2013-09-28 14:07:00 +08:00
U-Zyn Chua
7fb51ab50f Decimal support for MySQL. #3171 2013-09-28 09:23:46 +08:00
mark_story
cc5795c67d Merge branch 'master' into 2.5 2013-09-26 10:07:10 -04:00
Mark Story
ad1b80645d Merge pull request #1683 from andydhobbs/ticket-4108
Fix fields cache to depend on the schemaName as well.

Fixes #4108
2013-09-26 07:04:55 -07:00
Andy Hobbs
0f7d6a90a1 Ticket 4108
- Added schemaName to DboSource::fields() method cache key to fix bug with changing schema name
2013-09-26 11:56:14 +01:00
Renan Gonçalves
ad0944c491 Merge pull request #1681 from bcrowe/hotfix-camelcasejs
Updated JavaScript in doc blocks and helper references
2013-09-26 01:52:18 -07:00
Bryan Crowe
ab4bc16463 Updated Controller:: doc block and ControllerMergeVarsTest:: 2013-09-25 22:53:23 -04:00
Bryan Crowe
915b51b239 Updated JavaScript casing and JsHelper references in doc blocks 2013-09-25 22:46:38 -04:00
Mark Story
81ad97bb51 Merge pull request #1680 from Adduc/patch-1
$var in debug() docblock should be declared as mixed, not boolean
2013-09-25 12:58:40 -07:00
John Long
1e7f11aaff $var in debug() docblock should be declared as mixed, not boolean 2013-09-25 14:53:23 -05:00
Mark Story
ce9f547175 Merge pull request #1655 from dereuromark/2.5-inlist-clean
2.5 inList(), multiple() and case sensitivity
2013-09-25 11:45:29 -07:00
Mark Story
1c148c28f0 Merge pull request #1677 from dereuromark/master-cleanup
App::import to App::uses
2013-09-25 11:40:17 -07:00
euromark
0ae69aace9 App::import to App::uses 2013-09-25 19:40:14 +02:00
Mark Story
bb4716a9ee Merge pull request #1675 from bar/patch-1
Wrong signature.
2013-09-25 06:37:39 -07:00
Renan Gonçalves
f7a7e27206 Merge pull request #1674 from dereuromark/master-disabled-radio
Resolves ticket #4100
2013-09-25 06:09:26 -07:00
ber clausen
39bc8dff97 Wrong signature. 2013-09-25 09:12:49 -03:00
euromark
2455af09c5 Resolves ticket #4100 2013-09-25 14:01:35 +02:00
Mark Story
c71392716b Merge pull request #1673 from bcrowe/hotfix-instanceof
Replaced all is_a() calls with instanceof operator
2013-09-24 20:05:29 -07:00
Bryan Crowe
3e05ab897c Missed a couple instanceOf asserations 2013-09-24 22:12:51 -04:00
Bryan Crowe
9a1170cd2b Replaced true asserations with instanceOf asserations in test cases 2013-09-24 22:10:36 -04:00
Bryan Crowe
7d7954ce18 Replaced all is_a() calls with instanceof operator 2013-09-24 21:08:06 -04:00
Mark Story
b883202890 Merge pull request #1672 from dereuromark/master-instance
is_a() to instance of - completes PR 1669
2013-09-24 14:37:50 -07:00
euromark
653aed7701 is_a() to instance of - completes PR 1669 2013-09-24 22:57:51 +02:00
Mark Story
af368132a5 Merge pull request #1669 from bcrowe/hotfix-instancecheck
Use instanceof instead of is_a() in Controller.php
2013-09-23 18:51:46 -07:00
Bryan Crowe
1393325ad1 Use instanceof instead of is_a() in Controller.php 2013-09-23 21:37:27 -04:00
Mark Story
5059274183 Merge pull request #1668 from bcrowe/hotfix-bootstrapdocblock
Updated doc block readability in bootstrap.php
2013-09-23 18:15:38 -07:00
Bryan Crowe
e00812d3f8 Updated doc block readability in bootstrap.php 2013-09-23 21:09:26 -04:00
euromark
f7e507145c Case insensitive validation inList option. Resolves ticket 3521. Added two tests to proof the faulty behavior of $strict here. Also address the faulty behavior in multiple() and replace it with case sensitivity. 2013-09-24 02:01:50 +02:00
mark_story
d2577fac60 Merge branch 'master' into 2.5 2013-09-21 20:01:50 -04:00
Mark Story
7d0452fbbc Merge pull request #1662 from dereuromark/2.5-coverage
2.5 coverage
2013-09-21 15:55:27 -07:00
euromark
cbbd3ec6b3 correct doc block 2013-09-20 19:31:16 +02:00
euromark
b6a7cb7c7e Output overall coverage. 2013-09-20 19:15:51 +02:00
mark_story
a30f861f2c Use array_key_exists instead of isset()
This allows contains() to work with null values.

Fixes #4083
2013-09-19 21:44:09 -04:00
Mark Story
68aefe7eda Merge pull request #1658 from dereuromark/master-tests
correct and simplify tests
2013-09-18 16:24:36 -07:00
euromark
f62f46562c add missing create() for creating a new record. 2013-09-19 00:23:56 +02:00
euromark
17bd465cae simplify tests 2013-09-19 00:17:21 +02:00
Mark Story
3e8db7e5f7 Merge pull request #1657 from ADmad/bugfix/tree
Fixed TreeBehavior::recover() when using scope. 

Fixes #4062.
2013-09-18 14:57:37 -07:00
ADmad
1d89ee1c6d Fixed TreeBehavior::recover() when using scope. Fixes #4062. 2013-09-19 00:39:19 +05:30
Mark Story
e690c9340c Merge pull request #1656 from dereuromark/master-validation-rules-casing
Fix casing of validation rules in bake
2013-09-18 10:39:39 -07:00
euromark
58f38f1667 Fix casing of validation rules in bake 2013-09-18 18:31:55 +02:00
ADmad
61602990de Merge pull request #1652 from bcrowe/fix-caketimedocs
Updated CakeTime::i18nFormat() doc block description
2013-09-17 22:02:14 -07:00
Bryan Crowe
5c329b4875 Updated CakeTime::i18nFormat() doc block description 2013-09-17 23:09:46 -04:00
mark_story
809f6129e0 Update docs for HttpSocket methods.
delete() uses the request body, not the query string.
2013-09-17 21:17:26 -04:00
Mark Story
da805783fd Merge pull request #1650 from bcrowe/fix-jsonviewdocs
Corrected some grammar in the JsonView class doc blocks
2013-09-17 17:37:26 -07:00
Bryan Crowe
24a522f972 Updated doc block for JsonView's subDir property 2013-09-17 20:25:32 -04:00
Bryan Crowe
878e599976 Corrected some grammar in the JsonView class doc blocks 2013-09-17 20:15:18 -04:00
mark_story
a7a6fcae8a Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/VERSION.txt
2013-09-17 10:11:24 -04:00
Mark Story
eea56d3f23 Merge pull request #1648 from dereuromark/master
cs corrections
2013-09-17 07:05:14 -07:00
euromark
e3a3946e89 address casting cs 2013-09-17 15:15:25 +02:00