Commit graph

242 commits

Author SHA1 Message Date
Anthony GRASSIOT
aa42b80a4d a / an typo fixes fot API 2014-07-30 22:11:03 +02:00
mark_story
2bcd817367 Merge branch 'master' into 2.6 2014-07-03 11:13:06 -04:00
euromark
974ca851c2 Correct doc blocks according to cs guidelines.
Remove superfluous empty lines.
2014-07-03 15:36:42 +02:00
mark_story
6bacc5bb46 Merge branch 'master' into 2.6 2014-06-22 21:25:06 -04:00
mark_story
59c3b73f7a Skip autoloaders for APCIterator
We can skip autoloaders for this class as it is provided by
a C extension and will never come from userland code.
2014-06-22 21:22:00 -04:00
mark_story
ffe811935c Remove else.
By returning early we can avoid the else statement entirely.
2014-06-20 16:07:47 -04:00
mark_story
e683616329 Apply patch from 'biesbjerg' to ApcEngine
This set of changes allows ApcEngine to work with APCu and newer
versions of APC.

Fixes #3749
2014-06-20 13:59:05 -04:00
Carl Sutton
4a4a35768b simplify connect code for redis 2014-06-06 13:54:54 +01:00
mark_story
92eeef8ae0 Merge branch 'master' into 2.6 2014-06-02 22:57:25 -04:00
mark_story
47ce5928e1 Fix api doc errors in Cache. 2014-05-31 22:02:55 -04:00
mark_story
86c7d1ff5e Add addtional options array for memcached.
Memcached supports a number of options that we should afford in our
memcached adapter.

Fixes #3477
2014-05-23 22:29:03 -04:00
mark_story
e9ecfe0936 Remove x bit on files.
PHP files should not have executable permission set.
2014-05-13 12:30:14 -04:00
Dominik
cd445f2526 Add unix socket support to Redis cache engine
Refs #3438
2014-05-11 21:49:32 -04:00
euromark
0ece694a75 microptimize options and default merge and other string key array merges 2014-04-08 01:25:14 +02:00
mark_story
f9b45f1b60 Merge branch 'master' into 2.5 2014-03-30 21:24:55 -04:00
mark_story
6bf21c4a43 Update doc blocks to not be lies. 2014-03-27 11:55:54 -04:00
mark_story
b8c94fa5d4 Merge branch 'master' into 2.5 2014-02-18 22:19:12 -05:00
Ujwal Trivedi
1045a5e0a5 Update MemcacheEngine.php
removed 0 from getExtendedStats('slabs') in my last commit, someone point that out in the comment. Adding it back.
2014-02-18 18:40:17 -05:00
Ujwal Trivedi
cb0580a91a Update MemcacheEngine.php
removing variable assignment
2014-02-17 15:29:49 -05:00
Ujwal Trivedi
91ef655854 Update MemcacheEngine.php
adding $limit=0 to clear function so it deletes all the keys for real
2014-02-17 02:51:00 -05:00
davidsteinsland
881f81d01a Fixed undefined constant 2013-11-19 11:50:28 +01:00
davidsteinsland
7056ccd38a Added msgpack support for Memcached 2013-11-19 11:35:05 +01:00
ADmad
dda6080579 Merge branch 'master' into 2.5 2013-11-19 00:27:12 +05:30
Marc Würth
7cfa0116f4 Removed "PHP 5" from file header DocBlocks
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
Rachman Chavik
fb436644c3 RedisEngine: Support for selecting database number
Closes GH-2254
2013-10-31 20:45:39 +07:00
ADmad
d9ca148499 Merge branch 'master' into 2.5
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
2013-10-30 02:34:09 +05:30
ADmad
df523ded7c Fixed docblock. Closes #2193 2013-10-24 19:27:56 +05:30
Bryan Crowe
79846d25f8 Strict null check on group parameter 2013-10-22 22:11:02 -04:00
mark_story
5a394c379a Merge branch 'master' into 2.5 2013-10-14 22:57:50 -04:00
euromark
1cb24ae537 CS fixes using phpcs-fixer auto-correction. 2013-10-12 01:27:00 +02:00
José Lorenzo Rodríguez
9472b3149b Merge pull request #1704 from cakephp/2.5-cache
2.5 - Add Cache::remember()
2013-10-06 07:02:54 -07:00
mark_story
e85ac9339e Fix coding standards in comment. 2013-10-06 10:35:21 -03:00
mark_story
cb91a2d33c Add example to documentation for Cache::remember() 2013-10-05 10:56:55 -03:00
mark_story
f146d4334a Add Cache::remember()
This method provides a really simple approach to read-through caching.
A callable or Closure can be used to provide results when the cache is
empty.
2013-10-05 10:47:07 -03:00
Kamisama
5d30cb1559 Improve serializer engine assignment code 2013-10-04 00:05:01 -04:00
Kamisama
85e5ef4d4e Change $serializer visibility, and other fix 2013-10-01 21:13:26 -04:00
Kamisama
d099c5ad7e Add doc about the new serialize setting 2013-09-19 18:56:33 -04:00
Kamisama
7c83f7140f Rename serializer to serialize 2013-09-19 18:40:41 -04:00
Kamisama
72965f793c Remove unnecessary sprintf 2013-09-18 12:45:08 -04:00
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
12f2f729c8 more cs 2013-09-17 14:53:07 +02:00
mark_story
a2bd91638e Merge branch 'master' into 2.5 2013-09-12 19:47:13 -04: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
ADmad
c27aa99af9 Merge branch 'master' into 2.5 2013-09-08 20:36:40 +05:30
mark_story
0891073d19 Add coding standards ignore comments to FileEngine
We normally disallow error supression but it is the only way to
atomically delete files.
2013-09-06 12:19:23 -04:00
davidsteinsland
45b3417bd7 Fixed race conditions for FileEngine 2013-09-06 15:46:01 +02: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
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
Kamisama
c7dacb05e7 Add support for Amazon ElastiCache 2013-08-26 21:27:08 -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
Kamisama
e315f563be Add MemcachedEngine 2013-08-26 18:26:33 -04:00
mark_story
ceb35ac39a Merge branch 'master' into 2.4 2013-08-24 21:50:02 -04: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
euromark
361980fade remove code, class names and paths from translation strings. 2013-08-21 00:05:53 +02:00
dmromanov
56ef44f495 Excluded method names from several tanslation strings
Removed unnecessary sprintfs
2013-08-16 13:42:28 +04:00
euromark
f3018cc532 refactor methods to avoid else block on returning early 2013-08-12 19:06:34 +02:00
Jose Lorenzo Rodriguez
9d07fc4330 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/ShellDispatcher.php
	lib/Cake/Utility/CakeNumber.php
	lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
hiromi2424
29314e0fcc Fixing some errors related to unlink() on windows 2013-08-09 21:33:21 +09:00
hiromi2424
dc381dd4d3 Fix unlink() for CacheEngine::clear() failed on windows. 2013-08-09 21:32:57 +09:00
Mark Story
054668f149 Merge pull request #1194 from dereuromark/2.4-file-improvements
Allow creating of missing tmp directories in debug (development) mode
2013-08-07 09:52:07 -07:00
euromark
f5859ca719 allow creating of missing tmp directories in debug (development) mode for cache and log to avoid unnecessary errors thrown - using 0775 for dirs and 0664 for files 2013-08-07 13:24:45 +02:00
ADmad
38b050a711 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
mark_story
b5edcba309 Unlink files with full path. 2013-08-02 23:41:15 -04:00
mark_story
b999b4d9ae Fix error when clearing FileCache.
I made a mistake in a previous commit that did not account for dir()
returning directory names.
2013-08-02 23:32:17 -04:00
mark_story
b3860b3992 Fix clearing files in multiple groups.
When using multiple groups on a cache config, clearing was not working
properly. Clearing un-used cache configs also failed when the
directories did not exist.

Fixes #3930
2013-08-02 17:56:27 -04:00
mark_story
8a81903e37 Fix FileEngine not clearing keys when groups are used.
Fixes #3930
2013-07-27 22:20:40 -04:00
ADmad
636cc8c103 Merge branch 'master' into 2.4 2013-06-09 18:08:32 +05:30
mark_story
e5b1182a0d Only delete files that have a matching group + prefix.
Fixes #3873
2013-06-08 22:42:41 -04:00
ADmad
3303a2cda1 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
	lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
	lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
	lib/Cake/Console/Templates/skel/Config/acl.ini.php
	lib/Cake/Console/Templates/skel/Config/acl.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Console/Templates/skel/Config/database.php.default
	lib/Cake/Console/Templates/skel/Config/email.php.default
	lib/Cake/Console/Templates/skel/Config/routes.php
	lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
	lib/Cake/Console/Templates/skel/Console/cake.bat
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/Controller/AppController.php
	lib/Cake/Console/Templates/skel/Controller/PagesController.php
	lib/Cake/Console/Templates/skel/Model/AppModel.php
	lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
	lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Console/Templates/skel/index.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
ADmad
a10275fb8b Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
2013-05-05 14:36:46 +05:30
Rachman Chavik
5682907a88 Add Cache::groupConfigs() to get group->config map 2013-05-01 12:03:15 +07:00
euromark
09d9efe235 spelling corrections (a url to an URL, unify URL) 2013-04-29 11:05:17 +02:00
Rachman Chavik
03e5207aa1 Fix: write() after clearGroup() does not actually write to file
Although clearGroup() does not use $this->_File, it needs to be null-ed
so that subsequent write() call do not see stale object.
2013-04-26 14:43:36 +07:00
Adam Taylor
433dd09ec4 Fix typos 2013-03-05 00:05:14 -07:00
Marc Würth
f3262f768b Fix two typos in CacheEngine.php 2013-02-25 07:53:28 +01:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4 This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
euromark
11a88042bd fix doc block endings 2013-01-11 15:06:54 +01:00
euromark
05167a6420 assert that the cache does not silently fail 2013-01-07 13:43:21 +01:00
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
euromark
881127ef4d unify new lines at the end of the file 2012-12-05 15:00:24 +01:00
ADmad
72d6ca636f Docblock fixes 2012-11-29 04:36:29 +05:30
Rachman Chavik
7d844866f0 RedisEngine: authenticate connection if 'password' is set 2012-11-02 09:38:18 +07:00
dogmatic69
408e619c9f Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
mark_story
59e948fb1b Merge branch 'master' into 2.3 2012-09-28 21:20:24 -04:00
James Michael DuPont
2d46fc60be Fixing undefined variable usage
Squash of pull request #872
2012-09-28 20:46:25 -04:00
dogmatic69
aa87791432 replacing is_integer() with is_int() 2012-09-15 11:15:01 +01:00
dogmatic69
22a2e1b51e converting $foo == / $foo == 0 to !$foo (and a few $foo === 0) 2012-09-14 18:42:25 +01:00
euromark
3945c0e6a8 rtim files 2012-07-18 03:55:29 +02:00