Kamisama
5d509e23c2
Throw exception when selected serializer is not installed
2013-09-18 00:46:21 -04:00
Kamisama
bd3f005ab6
Add serializer option to Memcached Cache engine
...
Add option to select a serializer engine among php, json or igbinary
2013-09-18 00:29:48 -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
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
euromark
c8b18164c5
fix test
2013-09-16 00:49:01 +02: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
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
euromark
a796b26f13
fix renderLayout and update deprecated and outdated code
2013-09-13 00:09:31 +02:00
Simon Males
50ad043092
View::get() default param test
2013-09-11 22:22:50 +08:00
Mark Story
fd50c5277e
Merge pull request #1624 from ADmad/fix-paginator-order
...
Fix setting of order in Paginator options when using model's order.
Refs #3902
2013-09-10 13:41:51 -07:00
euromark
beff12d8a5
add missing params for parent call
2013-09-10 21:19:30 +02:00
ADmad
1d0c785725
Fixed setting of order in Paginator options when using model's order. Refs f680c76
, #3902
2013-09-10 22:47:31 +05:30
Ber Clausen
0a52061d86
Update afterFind() callback signature to be PHP5.4+ compliant.
2013-09-10 14:15:01 -03:00
Mark
994a5b00b6
Merge pull request #1622 from bar/php54-afterSave
...
Update Model/Behavior afterSave() callback signature to be PHP5.4+ compliant.
2013-09-10 04:04:04 -07:00
mark_story
fc2e1fac4e
Fix clearing groups with FileCache and no prefix.
...
If you used FileCache + groups + an empty prefix cached files would not
be cleared as strpos() would fail.
2013-09-09 22:24:18 -04:00
Ber Clausen
867d4b312d
Update afterSave() callback signature to be PHP5.4+ compliant.
2013-09-09 21:34:11 -03:00
Ber Clausen
98a32c334a
Fix CS.
2013-09-09 21:25:22 -03:00
mark_story
5210f831c8
Add test for insertMulti with id in the last spot.
...
Both tests work, so there are no changes to the implementation.
Closes #4048
2013-09-09 19:43:15 -04:00
mark_story
2fc3222322
Fix whitespace.
2013-09-09 12:20:54 -04:00
ovidiupruteanu
7019c79b81
Quoting test for null value and string column
2013-09-09 17:14:09 +03:00
ADmad
c27aa99af9
Merge branch 'master' into 2.5
2013-09-08 20:36:40 +05:30
Ber Clausen
c3ee9a2058
JsonView should return null if no data is set, regardless of the type of '_serialize'.
...
It should also honor true/false/0/'' values.
2013-09-07 02:38:52 -03:00
euromark
959988cfa1
Remove last yoda conditions as per coding standards guidelines.
2013-09-06 18:36:57 +02:00
Mark Story
66394f2201
Merge pull request #1610 from bar/php54-callback-signatures
...
Update Model/Behaviors callback signature to be PHP5.4+ compliant.
This may require updates to userland behaviours.
2013-09-05 11:11:15 -07:00
mark_story
6a6371b2d4
Fix CROSS JOINs
...
While seldomly used, CROSS joins should not generate invalid SQL.
Fixes #4050
2013-09-05 12:45:48 -04:00
mark_story
e3e4efba0a
Add test for issue #3936
...
radio() method should accept an array for the label element.
Refs #3936
2013-09-05 11:04:47 -04:00
mark_story
f22c4cf90b
Merge branch 'master' into 2.5
2013-09-05 10:21:41 -04:00
Ber Clausen
c524645738
Update Model/Behaviors callback signature to be PHP5.4+ compliant.
2013-09-05 11:17:02 -03:00
Rob McVey
7f44cc01b5
Plural of breif is breifs not breives
2013-09-04 09:20:32 +01:00
mark_story
4c92cdcada
Reorder inflection rules.
...
Place rules for words like 'archives' and 'relatives' before words like
'knives'.
Fixes #4040
2013-09-03 12:50:02 -04:00
mark_story
59bb05b433
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-02 11:35:09 -04:00
Renan Gonçalves
6750a65e1b
Merge pull request #1568 from markstory/2.5-encrypt
...
2.5 - Add Security::encrypt() and Security::decrypt()
2013-09-02 01:19:47 -07:00
mark_story
229c824da6
Remove a default helper from View.
...
This goes back to the days of yore and combined with
b8320fdbb7
it causes issues. The specific
issue at hand was testing a helper that uses other aliased helpers
(HtmlHelper specifically). The core helper would always be loaded
instead of the aliased one.
2013-09-01 21:39:59 -04:00
euromark
eb71eeeac5
add scope for generateTreeList - resolves ticket 4028
2013-09-01 01:02:26 -07:00
Ceeram
84c980f1f4
avoid notices when loading locale file
...
Conflicts:
lib/Cake/Test/Case/I18n/I18nTest.php
2013-09-01 06:05:40 +02:00
mark_story
9b0e26cc21
Deprecate MemcacheEngine and update defaults for Memcached
...
People should switch to Memcached instead. The underlying extension is
better maintained and provides improved features and performance.
Collapse the persistent and persistentId settings, while also making
non-persistent connections the default. Persistent connections should be
an opt-in feature as having them enabled by default could go very wrong
on shared hosting environments.
2013-08-31 13:29:54 -04:00
mark_story
9e8c4ad285
Rename persistent_id to persistentId.
...
The new name is more consistent with other settings in CakePHP.
2013-08-31 13:15:53 -04:00
Mark Story
0f9560c5cf
Merge pull request #1562 from kamisama/feature/2.5-memcached-cache-engine
...
2.5: Add Memcached storage engine for cache
Fixes #3511
2013-08-31 10:12:16 -07:00
Phally
28dbc5b89b
PHPCS fixes.
2013-08-31 13:30:05 +02:00
ADmad
75e8facd2f
Remove JS constant use from tests.
2013-08-31 11:45:59 +05:30
mark_story
4f237e6a93
Merge branch '2.4' making 2.4 into the master branch.
...
Conflicts:
lib/Cake/VERSION.txt
2013-08-30 16:02:42 -04:00
mark_story
7bd2174c5b
Refactor tests to use a data provider.
2013-08-30 15:36:18 -04:00
mark_story
94b602b684
Merge pull request #1456 'fix-for-3515' into 2.4
...
Conflicts:
lib/Cake/Test/Case/View/ViewTest.php
Fixes #3515
2013-08-30 15:27:49 -04:00
Mark Story
824a6f700b
Merge pull request #1563 from mvdriel/fix-i18n-extract
...
Extract category strings to separate .po files
2013-08-30 12:19:17 -07:00