Commit graph

5172 commits

Author SHA1 Message Date
mark_story
cc5795c67d Merge branch 'master' into 2.5 2013-09-26 10:07:10 -04: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
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
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
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
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
euromark
653aed7701 is_a() to instance of - completes PR 1669 2013-09-24 22:57:51 +02:00
Bryan Crowe
1393325ad1 Use instanceof instead of is_a() in Controller.php 2013-09-23 21:37:27 -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
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
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
ADmad
1d89ee1c6d Fixed TreeBehavior::recover() when using scope. Fixes #4062. 2013-09-19 00:39:19 +05:30
euromark
58f38f1667 Fix casing of validation rules in bake 2013-09-18 18:31:55 +02: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
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
euromark
e3a3946e89 address casting cs 2013-09-17 15:15:25 +02:00
euromark
12f2f729c8 more cs 2013-09-17 14:53:07 +02:00
euromark
382f75dbfc cs corrections, bool to boolean and int to integer. 2013-09-17 14:44:34 +02:00
mark_story
5ec9b145bf Fix label element for attributes not matching their inputs.
Radio elements would contain ModelModelFieldValue instead of
ModelFieldValue like they should. This was caused by the fix for #3936
and lack of tests for create() + radio().

Fixes #4071
2013-09-16 22:38:28 -04:00
spiliot
37c9832dc1 removed duplicate test case
Was exact duplicate of case starting line 692
2013-09-17 00:48:09 +03:00
mark_story
4ea6c158d1 Fix wording and remove trailing spaces. 2013-09-16 12:04:29 -04:00
Jerome Roethlisberger
3a4a0e54eb Improved wording of Model::invalidFields()
Inspired by
http://book.cakephp.org/2.0/en/models/data-validation/validating-data-from-the-controller.html#validating-data-from-the-controller
2013-09-16 16:13:58 +02:00
euromark
c8b18164c5 fix test 2013-09-16 00:49:01 +02:00
euromark
910ee33710 remove wrong trailing slash 2013-09-16 00:40:37 +02:00
mark_story
085636ea1b Update version number to 2.4.1 2013-09-14 22:07:19 -04:00
mark_story
7379d32b59 Simplify & fix phone number validation.
The changes made in fa3d4a0bb5 tightened
the area code validation too much and excluded at least one valid area
code. This change replaces that with a more generic solution that does
not attempt to exclude non-allocated but potentially valid area codes.

Fixes #4066
2013-09-13 23:05:40 -04:00
José Lorenzo Rodríguez
d40f9f7f67 Merge pull request #1574 from dereuromark/2.5-logging
2.5 logging - deprecate/disallow magic logging
2013-09-13 00:29:22 -07:00
Marc Würth
0a7d5b9c3f Corrected a CakeLog example in a DocBlock about scopes and types
> Its important to remember that
> when using scopes you must also define the `types` of log messages
>  that a logger will handle. Failing to do so will result in the logger
>  catching all log messages even if the scope is incorrect.

According to this the previous example would fail to log correctly.
2013-09-13 03:07:46 +02:00
euromark
61b05c40c6 remove autologging 2013-09-13 02:28:25 +02:00
mark_story
ba4afcc074 Fix incorrectly encoded address fields.
Address fields cannot contain : or " it causes a number of
mail servers/clients to be confused.

Fixes #4058
2013-09-12 20:14:11 -04:00
mark_story
a2bd91638e Merge branch 'master' into 2.5 2013-09-12 19:47:13 -04:00
Mark Story
ba016c2c68 Merge pull request #1630 from dereuromark/master-cleanup
Master cleanup
2013-09-12 16:46:18 -07:00
euromark
a796b26f13 fix renderLayout and update deprecated and outdated code 2013-09-13 00:09:31 +02:00
Marc Würth
446792987a Replaced two elseifs by if in sqlserver datasource 2013-09-11 23:15:05 +02:00
Simon Males
8311a16ebd Accurate description of what is returned 2013-09-11 22:28:09 +08:00