Browse Source

Adhering to coding standards

Jose Lorenzo Rodriguez 14 years ago
parent
commit
02d222a349

+ 4 - 4
lib/Cake/Cache/CacheEngine.php

@@ -33,7 +33,7 @@ abstract class CacheEngine {
  *
  * @var string
  **/
-	protected $groupPrefix = null;
+	protected $_groupPrefix = null;
 
 /**
  * Initialize the cache engine
@@ -51,7 +51,7 @@ abstract class CacheEngine {
 		);
 		if (!empty($this->settings['groups'])) {
 			sort($this->settings['groups']);
-			$this->groupPrefix = str_repeat('%s_', count($this->settings['groups']));
+			$this->_groupPrefix = str_repeat('%s_', count($this->settings['groups']));
 		}
 		if (!is_numeric($this->settings['duration'])) {
 			$this->settings['duration'] = strtotime($this->settings['duration']) - time();
@@ -166,8 +166,8 @@ abstract class CacheEngine {
 		}
 
 		$prefix = '';
-		if (!empty($this->groupPrefix)) {
-			$prefix = vsprintf($this->groupPrefix, $this->groups());
+		if (!empty($this->_groupPrefix)) {
+			$prefix = vsprintf($this->_groupPrefix, $this->groups());
 		}
 
 		$key = Inflector::underscore(str_replace(array(DS, '/', '.'), '_', strval($key)));

+ 4 - 5
lib/Cake/Cache/Engine/FileEngine.php

@@ -82,8 +82,8 @@ class FileEngine extends CacheEngine {
 		if (substr($this->settings['path'], -1) !== DS) {
 			$this->settings['path'] .= DS;
 		}
-		if (!empty($this->groupPrefix)) {
-			$this->groupPrefix = str_replace('_', DS, $this->groupPrefix);
+		if (!empty($this->_groupPrefix)) {
+			$this->_groupPrefix = str_replace('_', DS, $this->_groupPrefix);
 		}
 		return $this->_active();
 	}
@@ -288,10 +288,9 @@ class FileEngine extends CacheEngine {
  * @return boolean true if the cache key could be set, false otherwise
  */
 	protected function _setKey($key, $createKey = false) {
-
 		$groups = null;
-		if (!empty($this->groupPrefix)) {
-			$groups = vsprintf($this->groupPrefix, $this->groups());
+		if (!empty($this->_groupPrefix)) {
+			$groups = vsprintf($this->_groupPrefix, $this->groups());
 		}
 		$dir = $this->settings['path'] . $groups;
 

+ 1 - 1
lib/Cake/Cache/Engine/MemcacheEngine.php

@@ -284,6 +284,6 @@ class MemcacheEngine extends CacheEngine {
  * @return boolean success
  **/
 	public function clearGroup($group) {
-		return (bool) $this->_Memcache->increment($this->settings['prefix'] . $group);
+		return (bool)$this->_Memcache->increment($this->settings['prefix'] . $group);
 	}
 }

+ 0 - 1
lib/Cake/Cache/Engine/WincacheEngine.php

@@ -186,5 +186,4 @@ class WincacheEngine extends CacheEngine {
 		return $success;
 	}
 
-
 }

+ 1 - 1
lib/Cake/Cache/Engine/XcacheEngine.php

@@ -164,7 +164,7 @@ class XcacheEngine extends CacheEngine {
  * @return boolean success
  **/
 	public function clearGroup($group) {
-		return (bool) xcache_inc($this->settings['prefix'] . $group, 1);
+		return (bool)xcache_inc($this->settings['prefix'] . $group, 1);
 	}
 
 /**