Phally
4f91465af7
Safer way to prevent the array to string notice.
2013-09-01 06:16:10 +02: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
euromark
a36456cc87
Correct doc blocks for AuthComponent
2013-08-31 19:58:10 -07:00
José Lorenzo Rodríguez
f91eb3b508
Merge pull request #1587 from kimegede/cakenumber-docblock-update
...
Added @link to CakeNumber's docblock
2013-08-31 17:41:45 -07:00
Kim Egede Jakobsen
fcf9f34392
Added @link to CakeNumber's docblock
2013-08-31 17:32:48 -07:00
José Lorenzo Rodríguez
f32760e200
Merge pull request #1586 from kimegede/hash-docblock-update
...
Hash docblock update
2013-08-31 17:20:26 -07:00
Kim Egede Jakobsen
46d3d8e48e
Added @link to all public functions there have documentation.
...
And correct a small 'typo'.
2013-08-31 17:12:29 -07:00
mark_story
b8ad7f314a
Fix doc blocks.
2013-08-31 14:03:32 -04: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
Mark Story
dcb6b77ab6
Merge pull request #1571 from gilleswittenberg/no_confirm
...
Add y/yes option to schema create and update subcommands
2013-08-31 09:44:25 -07:00
Phally
dbbd05d850
Updates the Travis button to the master branch.
2013-08-31 13:55:09 +02: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
83db877765
Update version number to 2.4.0
2013-08-30 16:03:49 -04:00
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
ca9a305679
Update version number to 2.3.10
2013-08-30 15:56:44 -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
mark_story
95ad5f5c78
Add hmac to encrypted data.
...
Using an HMAC ensures that the ciphertext has not been
modified.
2013-08-29 14:40:01 -04:00
Mark van Driel
256e1f6532
Removed unused variable
2013-08-29 10:49:23 +02:00
Gilles Wittenberg
a54e8f238e
Add y/yes option to schema create and update subcommands
2013-08-29 09:13:54 +02:00
Mark Story
a902529702
Merge pull request #1570 from cakephp/issue-4030
...
2.4 - Load helpers at View construction.
2013-08-28 14:28:00 -07:00
mark_story
c03edd9d1a
Don't load Helpers in dataviews when _serialize is set.
...
Loading helpers when they aren't going to be used is wasteful.
2013-08-28 15:47:44 -04:00
Mark van Driel
cce1fafd80
Fixed typo in comments
2013-08-28 18:49:34 +02:00
mark_story
130ccf4714
Merge branch '2.4' into 2.5
2013-08-28 12:35:17 -04:00
mark_story
f18d354f55
Merge branch 'master' into 2.4
2013-08-28 12:35:07 -04:00
mark_story
b8320fdbb7
Load helpers at View construction.
...
Loading helpers earlier in View's lifecycle allows for the removal of
many duplicated code segments and a now useless property. It slightly
modifies how View behaves in a test case, but that issue is easily
remedied by calling loadHelpers() a second time.
This primarily fixes issues where helpers may not be loaded in View
subclasses if they override any of View's methods. This is particularly
problematic when aliased helpers are involved.
Refs #4030
2013-08-28 12:27:07 -04:00
mark_story
c5092851d1
Fix compatibility with PHP 5.2
2013-08-27 23:03:08 -04:00
mark_story
005a7d841d
Add support for aes encrypted cookies.
...
With Security supporting AES encryption it is also ideal to have AES
compatible cookies. Refactor and simplify code. Dynamic invocation of
static method is a bit obtuse and the various methods don't all have the
same arguments.
2013-08-27 21:34:18 -04:00
mark_story
215d43eb06
Add encrypt() and decrypt() methods.
...
These methods use AES-256 and provide a simple to use API with easy to
remember names.
2013-08-27 21:20:22 -04:00
mark_story
c1ae41da51
Correctly generate bigint primary keys in sqlite.
...
generate bigint primary keys correctly. Autoincrement cannot be set as
it only works with INTEGER columns[1]. I decided to use some string
manipulations as the entire SQL generation bits are a bit janky and I've
already re-written them for 3.0.
[1] https://www.sqlite.org/autoinc.html
Closes #GH-1552
2013-08-27 18:11:04 -04:00
Mark van Driel
ed10c3332d
Fixed typos in text and comments
2013-08-27 21:12:03 +02:00
Kamisama
70f321e327
Starting the memcached server on travis
...
To properly test the memcached cache engine
2013-08-27 14:48:36 -04:00
Kamisama
244df0764f
Coding standard and readability
2013-08-27 14:22:45 -04:00
Kamisama
bdd00c2307
Throw an exception if attempting to use authentication without SASL support installed
2013-08-27 13:57:57 -04:00
Kamisama
f093a31740
Remove unnecessary return
2013-08-27 13:22:03 -04:00
mark_story
1777c4fdd2
Merge pull request #1566 from andraskende/master
...
Update file cache docs to include the mask setting.
Refs #1566
2013-08-27 10:03:07 -04:00
Andras Kende
17f9661961
Added mask to File cache docblock
2013-08-27 10:02:48 -04:00
mark_story
ad7563736f
Expand doc blocks for CakeRequest::addDetector.
2013-08-27 09:46:59 -04:00
mark_story
e780919eb4
Merge pull request 1567 from calin-s into 2.5
...
Add ability to provide a list of valid param values when adding param
based detectors.
Refs #GH-1567
2013-08-27 09:39:20 -04:00
Calin
075bf37030
Added test case for param with options detector.
...
Fix coding standards errors.
2013-08-27 09:38:46 -04:00
Mark van Driel
c4ec8bedd0
Fixed category constant values: constants in Cake don't use the same values as PHP (Linux)
2013-08-27 12:30:39 +02:00
Mark van Driel
1fd936f3cc
Fixed cross-platform issue: LC_* constants have different values on windows
2013-08-27 10:51:00 +02:00
Calin
cf3dfb0c66
Allow 'options' to be given as array when adding a param detector - similar to env / options.
...
Allow the following when adding request detectors using CakeRequest::addDetector():
array('param'=>'{param-name}', 'options'=>array())
2013-08-27 11:00:32 +03:00
Kamisama
c7dacb05e7
Add support for Amazon ElastiCache
2013-08-26 21:27:08 -04:00
Kamisama
2b20ddc81c
Drop backup/restore Configure values
2013-08-26 20:55:38 -04:00
Kamisama
7c33878f4c
Coding standard fix
2013-08-26 20:55:19 -04:00