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
Kamisama
6a8913361f
Fix coding standards
2013-08-26 19:10:25 -04:00
ADmad
fc47bf9e1d
Avoid reparsing locale definition file.
2013-08-27 04:04:39 +05:30
Kamisama
e315f563be
Add MemcachedEngine
2013-08-26 18:26:33 -04:00
Mark Story
e7672b99c0
Merge pull request #1558 from dereuromark/2.4-unify-name
...
2.4 unify name
2013-08-25 16:15:59 -07:00
Mark van Driel
88d7fbeb53
Extract category strings to separate .po files
2013-08-25 23:04:05 +02:00
euromark
80d55feda6
also remove app ones
2013-08-25 21:42:03 +02:00
euromark
1aba204ec7
remove $name where not necessary to unify this in 2.x
2013-08-25 21:19:55 +02:00
mark_story
499212a86e
Merge branch '2.4' into 2.5
2013-08-24 21:51:51 -04:00
mark_story
42feb8dff6
Fix failing test.
...
Quote encoding in confirm handlers has changed in 2.4. Update the
relevant test.
2013-08-24 21:51:42 -04:00
mark_story
ceb35ac39a
Merge branch 'master' into 2.4
2013-08-24 21:50:02 -04:00
mark_story
f655e8a7bc
Minor simplification.
2013-08-24 21:49:17 -04:00
Mark Story
074fced586
Merge pull request #1549 from hencohen/ticket-4011
...
Ticket 4011 - Add support for matchers in Hash::remove() and Hash::insert()
2013-08-24 18:45:15 -07:00
Mark Story
f750c7d943
Merge pull request #1553 from zoghal/cache-fileengin
...
convert forbidden character in filename(on Windows) with underline
2013-08-24 16:39:04 -07:00
Saleh Souzanchi
d606bcb7fd
convert forbidden character in filename(Windows) with underline
2013-08-25 02:24:37 +04:30
Saleh Souzanchi
e157d8a7e6
convert forbidden character in filename(Windows) with underline
2013-08-25 02:09:13 +04:30
Chen Cohen
a0014e7a30
Ticket 4011 - Adding matchers support for Hash::remove() and Hash::insert()
2013-08-24 02:02:01 +03:00
mark_story
6d45953525
Merge branch '2.4' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-08-23 12:57:08 -04:00
