Adhering to coding standards

cakephp · Apr 23, 2012 · 02d222a · 02d222a
1 parent 042221b
commit 02d222a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/lib/Cake/Cache/CacheEngine.php b/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 @@ public function init($settings = array()) {
 		);
 		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 @@ public function key($key) {
 		}
 
 		$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)));

diff --git a/lib/Cake/Cache/Engine/FileEngine.php b/lib/Cake/Cache/Engine/FileEngine.php
@@ -82,8 +82,8 @@ public function init($settings = array()) {
 		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 @@ public function increment($key, $offset = 1) {
  * @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;
 

diff --git a/lib/Cake/Cache/Engine/MemcacheEngine.php b/lib/Cake/Cache/Engine/MemcacheEngine.php
@@ -284,6 +284,6 @@ public function groups() {
  * @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);
 	}
 }
diff --git a/lib/Cake/Cache/Engine/WincacheEngine.php b/lib/Cake/Cache/Engine/WincacheEngine.php
@@ -186,5 +186,4 @@ public function clearGroup($group) {
 		return $success;
 	}
 
-
 }
diff --git a/lib/Cake/Cache/Engine/XcacheEngine.php b/lib/Cake/Cache/Engine/XcacheEngine.php
@@ -164,7 +164,7 @@ public function groups() {
  * @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);
 	}
 
 /**