summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-12 21:19:13 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-12 21:19:13 +0100
commit6b535f51fcb94e0a645fda0d0356f4748076877e (patch)
tree63de22de13fac50cc34dd58ff0f7b8c732679061 /system
parent93dfe4123af679a4cf475f5e38e20dda0cbe9e75 (diff)
Fix some spaces and alignments in the new Wincache driver
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Cache/Cache.php21
-rw-r--r--system/libraries/Cache/drivers/Cache_wincache.php60
2 files changed, 38 insertions, 43 deletions
diff --git a/system/libraries/Cache/Cache.php b/system/libraries/Cache/Cache.php
index b89e5ab6f..7642a5270 100644
--- a/system/libraries/Cache/Cache.php
+++ b/system/libraries/Cache/Cache.php
@@ -39,20 +39,17 @@
class CI_Cache extends CI_Driver_Library {
protected $valid_drivers = array(
- 'cache_apc', 'cache_file', 'cache_memcached', 'cache_dummy', 'cache_wincache'
- );
-
- protected $_cache_path = NULL; // Path of cache files (if file-based cache)
- protected $_adapter = 'dummy';
+ 'cache_apc',
+ 'cache_file',
+ 'cache_memcached',
+ 'cache_dummy',
+ 'cache_wincache'
+ );
+
+ protected $_cache_path = NULL; // Path of cache files (if file-based cache)
+ protected $_adapter = 'dummy';
protected $_backup_driver;
- // ------------------------------------------------------------------------
-
- /**
- * Constructor
- *
- * @param array
- */
public function __construct($config = array())
{
if ( ! empty($config))
diff --git a/system/libraries/Cache/drivers/Cache_wincache.php b/system/libraries/Cache/drivers/Cache_wincache.php
index 8164b5a7b..df619d4e6 100644
--- a/system/libraries/Cache/drivers/Cache_wincache.php
+++ b/system/libraries/Cache/drivers/Cache_wincache.php
@@ -21,7 +21,7 @@
* @copyright Copyright (c) 2006 - 2012 EllisLab, Inc.
* @license http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
* @link http://codeigniter.com
- * @since Version 2.0
+ * @since Version 3.0
* @filesource
*/
@@ -37,52 +37,51 @@
* @subpackage Libraries
* @category Core
* @author Mike Murkovic
- * @link
+ * @link
*/
class CI_Cache_wincache extends CI_Driver {
/**
- * Get
+ * Get
*
- * Look for a value in the cache. If it exists, return the data
+ * Look for a value in the cache. If it exists, return the data,
* if not, return FALSE
*
- * @param string
- * @return mixed value that is stored/FALSE on failure
+ * @param string
+ * @return mixed value that is stored/FALSE on failure
*/
public function get($id)
{
$success = FALSE;
$data = wincache_ucache_get($id, $success);
-
- //Success returned by reference from wincache_ucache_get
+
+ // Success returned by reference from wincache_ucache_get()
return ($success) ? $data : FALSE;
}
- // ------------------------------------------------------------------------
-
+ // ------------------------------------------------------------------------
+
/**
* Cache Save
*
- * @param string Unique Key
- * @param mixed Data to store
- * @param int Length of time (in seconds) to cache the data
- *
- * @return boolean true on success/false on failure
+ * @param string Unique Key
+ * @param mixed Data to store
+ * @param int Length of time (in seconds) to cache the data
+ * @return bool true on success/false on failure
*/
public function save($id, $data, $ttl = 60)
{
return wincache_ucache_set($id, $data, $ttl);
}
-
+
// ------------------------------------------------------------------------
/**
* Delete from Cache
*
- * @param mixed unique identifier of the item in the cache
- * @param boolean true on success/false on failure
+ * @param mixed unique identifier of the item in the cache
+ * @param bool true on success/false on failure
*/
public function delete($id)
{
@@ -94,7 +93,7 @@ class CI_Cache_wincache extends CI_Driver {
/**
* Clean the cache
*
- * @return boolean false on failure/true on success
+ * @return bool false on failure/true on success
*/
public function clean()
{
@@ -106,11 +105,11 @@ class CI_Cache_wincache extends CI_Driver {
/**
* Cache Info
*
- * @return mixed array on success, false on failure
+ * @return mixed array on success, false on failure
*/
public function cache_info()
{
- return wincache_ucache_info(true);
+ return wincache_ucache_info(TRUE);
}
// ------------------------------------------------------------------------
@@ -118,12 +117,12 @@ class CI_Cache_wincache extends CI_Driver {
/**
* Get Cache Metadata
*
- * @param mixed key to get cache metadata on
- * @return mixed array on success/false on failure
+ * @param mixed key to get cache metadata on
+ * @return mixed array on success/false on failure
*/
public function get_metadata($id)
{
- if ($stored = wincache_ucache_info(false, $id))
+ if ($stored = wincache_ucache_info(FALSE, $id))
{
$age = $stored['ucache_entries'][1]['age_seconds'];
$ttl = $stored['ucache_entries'][1]['ttl_seconds'];
@@ -136,7 +135,8 @@ class CI_Cache_wincache extends CI_Driver {
'ttl' => $ttl
);
}
- return false;
+
+ return FALSE;
}
// ------------------------------------------------------------------------
@@ -145,23 +145,21 @@ class CI_Cache_wincache extends CI_Driver {
* is_supported()
*
* Check to see if WinCache is available on this system, bail if it isn't.
+ *
+ * @return bool
*/
public function is_supported()
{
- if ( ! extension_loaded('wincache') )
+ if ( ! extension_loaded('wincache'))
{
log_message('error', 'The Wincache PHP extension must be loaded to use Wincache Cache.');
return FALSE;
}
-
+
return TRUE;
}
- // ------------------------------------------------------------------------
-
-
}
-// End Class
/* End of file Cache_wincache.php */
/* Location: ./system/libraries/Cache/drivers/Cache_wincache.php */