nextcloud / server

lib/private/Memcache/CASTrait.php

Indentation +27 added lines, -27 removed lines

@@ -23,35 +23,35 @@
 namespace OC\Memcache;
 
 trait CASTrait {
-	abstract public function get($key);
+    abstract public function get($key);
 
-	abstract public function set($key, $value, $ttl = 0);
+    abstract public function set($key, $value, $ttl = 0);
 
-	abstract public function remove($key);
+    abstract public function remove($key);
 
-	abstract public function add($key, $value, $ttl = 0);
+    abstract public function add($key, $value, $ttl = 0);
 
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
-			if ($this->get($key) === $old) {
-				$this->set($key, $new);
-				$this->remove($key . '_lock');
-				return true;
-			} else {
-				$this->remove($key . '_lock');
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        //no native cas, emulate with locking
+        if ($this->add($key . '_lock', true)) {
+            if ($this->get($key) === $old) {
+                $this->set($key, $new);
+                $this->remove($key . '_lock');
+                return true;
+            } else {
+                $this->remove($key . '_lock');
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -41,13 +41,13 @@
 	 */
 	public function cas($key, $old, $new) {
 		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
+		if ($this->add($key.'_lock', true)) {
 			if ($this->get($key) === $old) {
 				$this->set($key, $new);
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return true;
 			} else {
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return false;
 			}
 		} else {

lib/private/Memcache/Cache.php

Indentation +56 added lines, -56 removed lines

@@ -26,72 +26,72 @@
 namespace OC\Memcache;
 
 abstract class Cache implements \ArrayAccess, \OCP\ICache {
-	/**
-	 * @var string $prefix
-	 */
-	protected $prefix;
+    /**
+     * @var string $prefix
+     */
+    protected $prefix;
 
-	/**
-	 * @param string $prefix
-	 */
-	public function __construct($prefix = '') {
-		$this->prefix = $prefix;
-	}
+    /**
+     * @param string $prefix
+     */
+    public function __construct($prefix = '') {
+        $this->prefix = $prefix;
+    }
 
-	/**
-	 * @return string Prefix used for caching purposes
-	 */
-	public function getPrefix() {
-		return $this->prefix;
-	}
+    /**
+     * @return string Prefix used for caching purposes
+     */
+    public function getPrefix() {
+        return $this->prefix;
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	abstract public function get($key);
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    abstract public function get($key);
 
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl
-	 * @return mixed
-	 */
-	abstract public function set($key, $value, $ttl = 0);
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl
+     * @return mixed
+     */
+    abstract public function set($key, $value, $ttl = 0);
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	abstract public function hasKey($key);
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    abstract public function hasKey($key);
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	abstract public function remove($key);
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    abstract public function remove($key);
 
-	/**
-	 * @param string $prefix
-	 * @return mixed
-	 */
-	abstract public function clear($prefix = '');
+    /**
+     * @param string $prefix
+     * @return mixed
+     */
+    abstract public function clear($prefix = '');
 
-	//implement the ArrayAccess interface
+    //implement the ArrayAccess interface
 
-	public function offsetExists($offset) {
-		return $this->hasKey($offset);
-	}
+    public function offsetExists($offset) {
+        return $this->hasKey($offset);
+    }
 
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
 
-	public function offsetGet($offset) {
-		return $this->get($offset);
-	}
+    public function offsetGet($offset) {
+        return $this->get($offset);
+    }
 
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
 }

lib/private/Memcache/CADTrait.php

Indentation +25 added lines, -25 removed lines

@@ -23,32 +23,32 @@
 namespace OC\Memcache;
 
 trait CADTrait {
-	abstract public function get($key);
+    abstract public function get($key);
 
-	abstract public function remove($key);
+    abstract public function remove($key);
 
-	abstract public function add($key, $value, $ttl = 0);
+    abstract public function add($key, $value, $ttl = 0);
 
-	/**
-	 * Compare and delete
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @return bool
-	 */
-	public function cad($key, $old) {
-		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
-			if ($this->get($key) === $old) {
-				$this->remove($key);
-				$this->remove($key . '_lock');
-				return true;
-			} else {
-				$this->remove($key . '_lock');
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Compare and delete
+     *
+     * @param string $key
+     * @param mixed $old
+     * @return bool
+     */
+    public function cad($key, $old) {
+        //no native cas, emulate with locking
+        if ($this->add($key . '_lock', true)) {
+            if ($this->get($key) === $old) {
+                $this->remove($key);
+                $this->remove($key . '_lock');
+                return true;
+            } else {
+                $this->remove($key . '_lock');
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -38,13 +38,13 @@
 	 */
 	public function cad($key, $old) {
 		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
+		if ($this->add($key.'_lock', true)) {
 			if ($this->get($key) === $old) {
 				$this->remove($key);
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return true;
 			} else {
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return false;
 			}
 		} else {

lib/private/Memcache/NullCache.php

Indentation +33 added lines, -33 removed lines

@@ -27,47 +27,47 @@
 namespace OC\Memcache;
 
 class NullCache extends Cache implements \OCP\IMemcache {
-	public function get($key) {
-		return null;
-	}
+    public function get($key) {
+        return null;
+    }
 
-	public function set($key, $value, $ttl = 0) {
-		return true;
-	}
+    public function set($key, $value, $ttl = 0) {
+        return true;
+    }
 
-	public function hasKey($key) {
-		return false;
-	}
+    public function hasKey($key) {
+        return false;
+    }
 
-	public function remove($key) {
-		return true;
-	}
+    public function remove($key) {
+        return true;
+    }
 
-	public function add($key, $value, $ttl = 0) {
-		return true;
-	}
+    public function add($key, $value, $ttl = 0) {
+        return true;
+    }
 
-	public function inc($key, $step = 1) {
-		return true;
-	}
+    public function inc($key, $step = 1) {
+        return true;
+    }
 
-	public function dec($key, $step = 1) {
-		return true;
-	}
+    public function dec($key, $step = 1) {
+        return true;
+    }
 
-	public function cas($key, $old, $new) {
-		return true;
-	}
+    public function cas($key, $old, $new) {
+        return true;
+    }
 
-	public function cad($key, $old) {
-		return true;
-	}
+    public function cad($key, $old) {
+        return true;
+    }
 
-	public function clear($prefix = '') {
-		return true;
-	}
+    public function clear($prefix = '') {
+        return true;
+    }
 
-	static public function isAvailable() {
-		return true;
-	}
+    static public function isAvailable() {
+        return true;
+    }
 }

lib/private/Memcache/XCache.php

Indentation +87 added lines, -87 removed lines

@@ -35,102 +35,102 @@
  * functions etc.
  */
 class XCache extends Cache implements IMemcache {
-	use CASTrait;
+    use CASTrait;
 
-	use CADTrait;
+    use CADTrait;
 
-	/**
-	 * entries in XCache gets namespaced to prevent collisions between ownCloud instances and users
-	 */
-	protected function getNameSpace() {
-		return $this->prefix;
-	}
+    /**
+     * entries in XCache gets namespaced to prevent collisions between ownCloud instances and users
+     */
+    protected function getNameSpace() {
+        return $this->prefix;
+    }
 
-	public function get($key) {
-		return xcache_get($this->getNamespace() . $key);
-	}
+    public function get($key) {
+        return xcache_get($this->getNamespace() . $key);
+    }
 
-	public function set($key, $value, $ttl = 0) {
-		if ($ttl > 0) {
-			return xcache_set($this->getNamespace() . $key, $value, $ttl);
-		} else {
-			return xcache_set($this->getNamespace() . $key, $value);
-		}
-	}
+    public function set($key, $value, $ttl = 0) {
+        if ($ttl > 0) {
+            return xcache_set($this->getNamespace() . $key, $value, $ttl);
+        } else {
+            return xcache_set($this->getNamespace() . $key, $value);
+        }
+    }
 
-	public function hasKey($key) {
-		return xcache_isset($this->getNamespace() . $key);
-	}
+    public function hasKey($key) {
+        return xcache_isset($this->getNamespace() . $key);
+    }
 
-	public function remove($key) {
-		return xcache_unset($this->getNamespace() . $key);
-	}
+    public function remove($key) {
+        return xcache_unset($this->getNamespace() . $key);
+    }
 
-	public function clear($prefix = '') {
-		if (function_exists('xcache_unset_by_prefix')) {
-			return xcache_unset_by_prefix($this->getNamespace() . $prefix);
-		} else {
-			// Since we can not clear by prefix, we just clear the whole cache.
-			xcache_clear_cache(\XC_TYPE_VAR, 0);
-		}
-		return true;
-	}
+    public function clear($prefix = '') {
+        if (function_exists('xcache_unset_by_prefix')) {
+            return xcache_unset_by_prefix($this->getNamespace() . $prefix);
+        } else {
+            // Since we can not clear by prefix, we just clear the whole cache.
+            xcache_clear_cache(\XC_TYPE_VAR, 0);
+        }
+        return true;
+    }
 
-	/**
-	 * Set a value in the cache if it's not already stored
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
-	 * @return bool
-	 */
-	public function add($key, $value, $ttl = 0) {
-		if ($this->hasKey($key)) {
-			return false;
-		} else {
-			return $this->set($key, $value, $ttl);
-		}
-	}
+    /**
+     * Set a value in the cache if it's not already stored
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+     * @return bool
+     */
+    public function add($key, $value, $ttl = 0) {
+        if ($this->hasKey($key)) {
+            return false;
+        } else {
+            return $this->set($key, $value, $ttl);
+        }
+    }
 
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		return xcache_inc($this->getPrefix() . $key, $step);
-	}
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        return xcache_inc($this->getPrefix() . $key, $step);
+    }
 
-	/**
-	 * Decrease a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function dec($key, $step = 1) {
-		return xcache_dec($this->getPrefix() . $key, $step);
-	}
+    /**
+     * Decrease a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function dec($key, $step = 1) {
+        return xcache_dec($this->getPrefix() . $key, $step);
+    }
 
-	static public function isAvailable() {
-		if (!extension_loaded('xcache')) {
-			return false;
-		}
-		if (\OC::$CLI && !getenv('XCACHE_TEST')) {
-			return false;
-		}
-		if (!function_exists('xcache_unset_by_prefix') && \OC::$server->getIniWrapper()->getBool('xcache.admin.enable_auth')) {
-			// We do not want to use XCache if we can not clear it without
-			// using the administration function xcache_clear_cache()
-			// AND administration functions are password-protected.
-			return false;
-		}
-		$var_size = \OC::$server->getIniWrapper()->getBytes('xcache.var_size');
-		if (!$var_size) {
-			return false;
-		}
-		return true;
-	}
+    static public function isAvailable() {
+        if (!extension_loaded('xcache')) {
+            return false;
+        }
+        if (\OC::$CLI && !getenv('XCACHE_TEST')) {
+            return false;
+        }
+        if (!function_exists('xcache_unset_by_prefix') && \OC::$server->getIniWrapper()->getBool('xcache.admin.enable_auth')) {
+            // We do not want to use XCache if we can not clear it without
+            // using the administration function xcache_clear_cache()
+            // AND administration functions are password-protected.
+            return false;
+        }
+        $var_size = \OC::$server->getIniWrapper()->getBytes('xcache.var_size');
+        if (!$var_size) {
+            return false;
+        }
+        return true;
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -47,28 +47,28 @@ 
 	}
 
 	public function get($key) {
-		return xcache_get($this->getNamespace() . $key);
+		return xcache_get($this->getNamespace().$key);
 	}
 
 	public function set($key, $value, $ttl = 0) {
 		if ($ttl > 0) {
-			return xcache_set($this->getNamespace() . $key, $value, $ttl);
+			return xcache_set($this->getNamespace().$key, $value, $ttl);
 		} else {
-			return xcache_set($this->getNamespace() . $key, $value);
+			return xcache_set($this->getNamespace().$key, $value);
 		}
 	}
 
 	public function hasKey($key) {
-		return xcache_isset($this->getNamespace() . $key);
+		return xcache_isset($this->getNamespace().$key);
 	}
 
 	public function remove($key) {
-		return xcache_unset($this->getNamespace() . $key);
+		return xcache_unset($this->getNamespace().$key);
 	}
 
 	public function clear($prefix = '') {
 		if (function_exists('xcache_unset_by_prefix')) {
-			return xcache_unset_by_prefix($this->getNamespace() . $prefix);
+			return xcache_unset_by_prefix($this->getNamespace().$prefix);
 		} else {
 			// Since we can not clear by prefix, we just clear the whole cache.
 			xcache_clear_cache(\XC_TYPE_VAR, 0);
@@ -100,7 +100,7 @@ 
 	 * @return int | bool
 	 */
 	public function inc($key, $step = 1) {
-		return xcache_inc($this->getPrefix() . $key, $step);
+		return xcache_inc($this->getPrefix().$key, $step);
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @return int | bool
 	 */
 	public function dec($key, $step = 1) {
-		return xcache_dec($this->getPrefix() . $key, $step);
+		return xcache_dec($this->getPrefix().$key, $step);
 	}
 
 	static public function isAvailable() {

lib/private/Memcache/Redis.php

Indentation +148 added lines, -148 removed lines

@@ -29,153 +29,153 @@
 use OCP\IMemcacheTTL;
 
 class Redis extends Cache implements IMemcacheTTL {
-	/**
-	 * @var \Redis $cache
-	 */
-	private static $cache = null;
-
-	public function __construct($prefix = '') {
-		parent::__construct($prefix);
-		if (is_null(self::$cache)) {
-			self::$cache = \OC::$server->getGetRedisFactory()->getInstance();
-		}
-	}
-
-	/**
-	 * entries in redis get namespaced to prevent collisions between ownCloud instances and users
-	 */
-	protected function getNameSpace() {
-		return $this->prefix;
-	}
-
-	public function get($key) {
-		$result = self::$cache->get($this->getNamespace() . $key);
-		if ($result === false && !self::$cache->exists($this->getNamespace() . $key)) {
-			return null;
-		} else {
-			return json_decode($result, true);
-		}
-	}
-
-	public function set($key, $value, $ttl = 0) {
-		if ($ttl > 0) {
-			return self::$cache->setex($this->getNamespace() . $key, $ttl, json_encode($value));
-		} else {
-			return self::$cache->set($this->getNamespace() . $key, json_encode($value));
-		}
-	}
-
-	public function hasKey($key) {
-		return self::$cache->exists($this->getNamespace() . $key);
-	}
-
-	public function remove($key) {
-		if (self::$cache->delete($this->getNamespace() . $key)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public function clear($prefix = '') {
-		$prefix = $this->getNamespace() . $prefix . '*';
-		$it = null;
-		self::$cache->setOption(\Redis::OPT_SCAN, \Redis::SCAN_RETRY);
-		while ($keys = self::$cache->scan($it, $prefix)) {
-			self::$cache->delete($keys);
-		}
-		return true;
-	}
-
-	/**
-	 * Set a value in the cache if it's not already stored
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
-	 * @return bool
-	 */
-	public function add($key, $value, $ttl = 0) {
-		// don't encode ints for inc/dec
-		if (!is_int($value)) {
-			$value = json_encode($value);
-		}
-		return self::$cache->setnx($this->getPrefix() . $key, $value);
-	}
-
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		return self::$cache->incrBy($this->getNamespace() . $key, $step);
-	}
-
-	/**
-	 * Decrease a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function dec($key, $step = 1) {
-		if (!$this->hasKey($key)) {
-			return false;
-		}
-		return self::$cache->decrBy($this->getNamespace() . $key, $step);
-	}
-
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		if (!is_int($new)) {
-			$new = json_encode($new);
-		}
-		self::$cache->watch($this->getNamespace() . $key);
-		if ($this->get($key) === $old) {
-			$result = self::$cache->multi()
-				->set($this->getNamespace() . $key, $new)
-				->exec();
-			return ($result === false) ? false : true;
-		}
-		self::$cache->unwatch();
-		return false;
-	}
-
-	/**
-	 * Compare and delete
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @return bool
-	 */
-	public function cad($key, $old) {
-		self::$cache->watch($this->getNamespace() . $key);
-		if ($this->get($key) === $old) {
-			$result = self::$cache->multi()
-				->del($this->getNamespace() . $key)
-				->exec();
-			return ($result === false) ? false : true;
-		}
-		self::$cache->unwatch();
-		return false;
-	}
-
-	public function setTTL($key, $ttl) {
-		self::$cache->expire($this->getNamespace() . $key, $ttl);
-	}
-
-	static public function isAvailable() {
-		return \OC::$server->getGetRedisFactory()->isAvailable();
-	}
+    /**
+     * @var \Redis $cache
+     */
+    private static $cache = null;
+
+    public function __construct($prefix = '') {
+        parent::__construct($prefix);
+        if (is_null(self::$cache)) {
+            self::$cache = \OC::$server->getGetRedisFactory()->getInstance();
+        }
+    }
+
+    /**
+     * entries in redis get namespaced to prevent collisions between ownCloud instances and users
+     */
+    protected function getNameSpace() {
+        return $this->prefix;
+    }
+
+    public function get($key) {
+        $result = self::$cache->get($this->getNamespace() . $key);
+        if ($result === false && !self::$cache->exists($this->getNamespace() . $key)) {
+            return null;
+        } else {
+            return json_decode($result, true);
+        }
+    }
+
+    public function set($key, $value, $ttl = 0) {
+        if ($ttl > 0) {
+            return self::$cache->setex($this->getNamespace() . $key, $ttl, json_encode($value));
+        } else {
+            return self::$cache->set($this->getNamespace() . $key, json_encode($value));
+        }
+    }
+
+    public function hasKey($key) {
+        return self::$cache->exists($this->getNamespace() . $key);
+    }
+
+    public function remove($key) {
+        if (self::$cache->delete($this->getNamespace() . $key)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function clear($prefix = '') {
+        $prefix = $this->getNamespace() . $prefix . '*';
+        $it = null;
+        self::$cache->setOption(\Redis::OPT_SCAN, \Redis::SCAN_RETRY);
+        while ($keys = self::$cache->scan($it, $prefix)) {
+            self::$cache->delete($keys);
+        }
+        return true;
+    }
+
+    /**
+     * Set a value in the cache if it's not already stored
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+     * @return bool
+     */
+    public function add($key, $value, $ttl = 0) {
+        // don't encode ints for inc/dec
+        if (!is_int($value)) {
+            $value = json_encode($value);
+        }
+        return self::$cache->setnx($this->getPrefix() . $key, $value);
+    }
+
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        return self::$cache->incrBy($this->getNamespace() . $key, $step);
+    }
+
+    /**
+     * Decrease a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function dec($key, $step = 1) {
+        if (!$this->hasKey($key)) {
+            return false;
+        }
+        return self::$cache->decrBy($this->getNamespace() . $key, $step);
+    }
+
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        if (!is_int($new)) {
+            $new = json_encode($new);
+        }
+        self::$cache->watch($this->getNamespace() . $key);
+        if ($this->get($key) === $old) {
+            $result = self::$cache->multi()
+                ->set($this->getNamespace() . $key, $new)
+                ->exec();
+            return ($result === false) ? false : true;
+        }
+        self::$cache->unwatch();
+        return false;
+    }
+
+    /**
+     * Compare and delete
+     *
+     * @param string $key
+     * @param mixed $old
+     * @return bool
+     */
+    public function cad($key, $old) {
+        self::$cache->watch($this->getNamespace() . $key);
+        if ($this->get($key) === $old) {
+            $result = self::$cache->multi()
+                ->del($this->getNamespace() . $key)
+                ->exec();
+            return ($result === false) ? false : true;
+        }
+        self::$cache->unwatch();
+        return false;
+    }
+
+    public function setTTL($key, $ttl) {
+        self::$cache->expire($this->getNamespace() . $key, $ttl);
+    }
+
+    static public function isAvailable() {
+        return \OC::$server->getGetRedisFactory()->isAvailable();
+    }
 }
 

Spacing +15 added lines, -15 removed lines

@@ -49,8 +49,8 @@ 
 	}
 
 	public function get($key) {
-		$result = self::$cache->get($this->getNamespace() . $key);
-		if ($result === false && !self::$cache->exists($this->getNamespace() . $key)) {
+		$result = self::$cache->get($this->getNamespace().$key);
+		if ($result === false && !self::$cache->exists($this->getNamespace().$key)) {
 			return null;
 		} else {
 			return json_decode($result, true);
@@ -59,18 +59,18 @@ 
 
 	public function set($key, $value, $ttl = 0) {
 		if ($ttl > 0) {
-			return self::$cache->setex($this->getNamespace() . $key, $ttl, json_encode($value));
+			return self::$cache->setex($this->getNamespace().$key, $ttl, json_encode($value));
 		} else {
-			return self::$cache->set($this->getNamespace() . $key, json_encode($value));
+			return self::$cache->set($this->getNamespace().$key, json_encode($value));
 		}
 	}
 
 	public function hasKey($key) {
-		return self::$cache->exists($this->getNamespace() . $key);
+		return self::$cache->exists($this->getNamespace().$key);
 	}
 
 	public function remove($key) {
-		if (self::$cache->delete($this->getNamespace() . $key)) {
+		if (self::$cache->delete($this->getNamespace().$key)) {
 			return true;
 		} else {
 			return false;
@@ -78,7 +78,7 @@ 
 	}
 
 	public function clear($prefix = '') {
-		$prefix = $this->getNamespace() . $prefix . '*';
+		$prefix = $this->getNamespace().$prefix.'*';
 		$it = null;
 		self::$cache->setOption(\Redis::OPT_SCAN, \Redis::SCAN_RETRY);
 		while ($keys = self::$cache->scan($it, $prefix)) {
@@ -100,7 +100,7 @@ 
 		if (!is_int($value)) {
 			$value = json_encode($value);
 		}
-		return self::$cache->setnx($this->getPrefix() . $key, $value);
+		return self::$cache->setnx($this->getPrefix().$key, $value);
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @return int | bool
 	 */
 	public function inc($key, $step = 1) {
-		return self::$cache->incrBy($this->getNamespace() . $key, $step);
+		return self::$cache->incrBy($this->getNamespace().$key, $step);
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 		if (!$this->hasKey($key)) {
 			return false;
 		}
-		return self::$cache->decrBy($this->getNamespace() . $key, $step);
+		return self::$cache->decrBy($this->getNamespace().$key, $step);
 	}
 
 	/**
@@ -140,10 +140,10 @@ 
 		if (!is_int($new)) {
 			$new = json_encode($new);
 		}
-		self::$cache->watch($this->getNamespace() . $key);
+		self::$cache->watch($this->getNamespace().$key);
 		if ($this->get($key) === $old) {
 			$result = self::$cache->multi()
-				->set($this->getNamespace() . $key, $new)
+				->set($this->getNamespace().$key, $new)
 				->exec();
 			return ($result === false) ? false : true;
 		}
@@ -159,10 +159,10 @@ 
 	 * @return bool
 	 */
 	public function cad($key, $old) {
-		self::$cache->watch($this->getNamespace() . $key);
+		self::$cache->watch($this->getNamespace().$key);
 		if ($this->get($key) === $old) {
 			$result = self::$cache->multi()
-				->del($this->getNamespace() . $key)
+				->del($this->getNamespace().$key)
 				->exec();
 			return ($result === false) ? false : true;
 		}
@@ -171,7 +171,7 @@ 
 	}
 
 	public function setTTL($key, $ttl) {
-		self::$cache->expire($this->getNamespace() . $key, $ttl);
+		self::$cache->expire($this->getNamespace().$key, $ttl);
 	}
 
 	static public function isAvailable() {

lib/private/OCS/Provider.php

Indentation +65 added lines, -65 removed lines

@@ -24,75 +24,75 @@
 namespace OC\OCS;
 
 class Provider extends \OCP\AppFramework\Controller {
-	/** @var \OCP\App\IAppManager */
-	private $appManager;
+    /** @var \OCP\App\IAppManager */
+    private $appManager;
 
-	/**
-	 * @param string $appName
-	 * @param \OCP\IRequest $request
-	 * @param \OCP\App\IAppManager $appManager
-	 */
-	public function __construct($appName,
-								\OCP\IRequest $request,
-								\OCP\App\IAppManager $appManager) {
-		parent::__construct($appName, $request);
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param string $appName
+     * @param \OCP\IRequest $request
+     * @param \OCP\App\IAppManager $appManager
+     */
+    public function __construct($appName,
+                                \OCP\IRequest $request,
+                                \OCP\App\IAppManager $appManager) {
+        parent::__construct($appName, $request);
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * @return \OCP\AppFramework\Http\JSONResponse
-	 */
-	public function buildProviderList() {
-		$services = [
-			'PRIVATE_DATA' => [
-				'version' => 1,
-				'endpoints' => [
-					'store' => '/ocs/v2.php/privatedata/setattribute',
-					'read' => '/ocs/v2.php/privatedata/getattribute',
-					'delete' => '/ocs/v2.php/privatedata/deleteattribute',
-				],
-			],
-		];
+    /**
+     * @return \OCP\AppFramework\Http\JSONResponse
+     */
+    public function buildProviderList() {
+        $services = [
+            'PRIVATE_DATA' => [
+                'version' => 1,
+                'endpoints' => [
+                    'store' => '/ocs/v2.php/privatedata/setattribute',
+                    'read' => '/ocs/v2.php/privatedata/getattribute',
+                    'delete' => '/ocs/v2.php/privatedata/deleteattribute',
+                ],
+            ],
+        ];
 
-		if($this->appManager->isEnabledForUser('files_sharing')) {
-			$services['SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
-				],
-			];
-			$services['FEDERATED_SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/cloud/shares',
-					'webdav' => '/public.php/webdav/',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('files_sharing')) {
+            $services['SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
+                ],
+            ];
+            $services['FEDERATED_SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/cloud/shares',
+                    'webdav' => '/public.php/webdav/',
+                ],
+            ];
+        }
 
-		if($this->appManager->isEnabledForUser('activity')) {
-			$services['ACTIVITY'] = [
-				'version' => 1,
-				'endpoints' => [
-					'list' => '/ocs/v2.php/cloud/activity',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('activity')) {
+            $services['ACTIVITY'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'list' => '/ocs/v2.php/cloud/activity',
+                ],
+            ];
+        }
 
-		if($this->appManager->isEnabledForUser('provisioning_api')) {
-			$services['PROVISIONING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'user' => '/ocs/v2.php/cloud/users',
-					'groups' => '/ocs/v2.php/cloud/groups',
-					'apps' => '/ocs/v2.php/cloud/apps',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('provisioning_api')) {
+            $services['PROVISIONING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'user' => '/ocs/v2.php/cloud/users',
+                    'groups' => '/ocs/v2.php/cloud/groups',
+                    'apps' => '/ocs/v2.php/cloud/apps',
+                ],
+            ];
+        }
 
-		return new \OCP\AppFramework\Http\JSONResponse([
-			'version' => 2,
-			'services' => $services,
-		]);
-	}
+        return new \OCP\AppFramework\Http\JSONResponse([
+            'version' => 2,
+            'services' => $services,
+        ]);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
 			],
 		];
 
-		if($this->appManager->isEnabledForUser('files_sharing')) {
+		if ($this->appManager->isEnabledForUser('files_sharing')) {
 			$services['SHARING'] = [
 				'version' => 1,
 				'endpoints' => [
@@ -70,7 +70,7 @@ 
 			];
 		}
 
-		if($this->appManager->isEnabledForUser('activity')) {
+		if ($this->appManager->isEnabledForUser('activity')) {
 			$services['ACTIVITY'] = [
 				'version' => 1,
 				'endpoints' => [
@@ -79,7 +79,7 @@ 
 			];
 		}
 
-		if($this->appManager->isEnabledForUser('provisioning_api')) {
+		if ($this->appManager->isEnabledForUser('provisioning_api')) {
 			$services['PROVISIONING'] = [
 				'version' => 1,
 				'endpoints' => [

lib/private/OCS/Result.php

Indentation +124 added lines, -124 removed lines

@@ -32,129 +32,129 @@
 
 class Result {
 
-	/** @var array  */
-	protected $data;
-
-	/** @var null|string */
-	protected $message;
-
-	/** @var int */
-	protected $statusCode;
-
-	/** @var integer */
-	protected $items;
-
-	/** @var integer */
-	protected $perPage;
-
-	/** @var array */
-	private $headers = [];
-
-	/**
-	 * create the OCS_Result object
-	 * @param mixed $data the data to return
-	 * @param int $code
-	 * @param null|string $message
-	 * @param array $headers
-	 */
-	public function __construct($data = null, $code = 100, $message = null, $headers = []) {
-		if ($data === null) {
-			$this->data = array();
-		} elseif (!is_array($data)) {
-			$this->data = array($this->data);
-		} else {
-			$this->data = $data;
-		}
-		$this->statusCode = $code;
-		$this->message = $message;
-		$this->headers = $headers;
-	}
-
-	/**
-	 * optionally set the total number of items available
-	 * @param int $items
-	 */
-	public function setTotalItems($items) {
-		$this->items = $items;
-	}
-
-	/**
-	 * optionally set the the number of items per page
-	 * @param int $items
-	 */
-	public function setItemsPerPage($items) {
-		$this->perPage = $items;
-	}
-
-	/**
-	 * get the status code
-	 * @return int
-	 */
-	public function getStatusCode() {
-		return $this->statusCode;
-	}
-
-	/**
-	 * get the meta data for the result
-	 * @return array
-	 */
-	public function getMeta() {
-		$meta = array();
-		$meta['status'] = $this->succeeded() ? 'ok' : 'failure';
-		$meta['statuscode'] = $this->statusCode;
-		$meta['message'] = $this->message;
-		if(isset($this->items)) {
-			$meta['totalitems'] = $this->items;
-		}
-		if(isset($this->perPage)) {
-			$meta['itemsperpage'] = $this->perPage;
-		}
-		return $meta;
-
-	}
-
-	/**
-	 * get the result data
-	 * @return array
-	 */
-	public function getData() {
-		return $this->data;
-	}
-
-	/**
-	 * return bool Whether the method succeeded
-	 * @return bool
-	 */
-	public function succeeded() {
-		return ($this->statusCode == 100);
-	}
-
-	/**
-	 * Adds a new header to the response
-	 * @param string $name The name of the HTTP header
-	 * @param string $value The value, null will delete it
-	 * @return $this
-	 */
-	public function addHeader($name, $value) {
-		$name = trim($name);  // always remove leading and trailing whitespace
-		// to be able to reliably check for security
-		// headers
-
-		if(is_null($value)) {
-			unset($this->headers[$name]);
-		} else {
-			$this->headers[$name] = $value;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Returns the set headers
-	 * @return array the headers
-	 */
-	public function getHeaders() {
-		return $this->headers;
-	}
+    /** @var array  */
+    protected $data;
+
+    /** @var null|string */
+    protected $message;
+
+    /** @var int */
+    protected $statusCode;
+
+    /** @var integer */
+    protected $items;
+
+    /** @var integer */
+    protected $perPage;
+
+    /** @var array */
+    private $headers = [];
+
+    /**
+     * create the OCS_Result object
+     * @param mixed $data the data to return
+     * @param int $code
+     * @param null|string $message
+     * @param array $headers
+     */
+    public function __construct($data = null, $code = 100, $message = null, $headers = []) {
+        if ($data === null) {
+            $this->data = array();
+        } elseif (!is_array($data)) {
+            $this->data = array($this->data);
+        } else {
+            $this->data = $data;
+        }
+        $this->statusCode = $code;
+        $this->message = $message;
+        $this->headers = $headers;
+    }
+
+    /**
+     * optionally set the total number of items available
+     * @param int $items
+     */
+    public function setTotalItems($items) {
+        $this->items = $items;
+    }
+
+    /**
+     * optionally set the the number of items per page
+     * @param int $items
+     */
+    public function setItemsPerPage($items) {
+        $this->perPage = $items;
+    }
+
+    /**
+     * get the status code
+     * @return int
+     */
+    public function getStatusCode() {
+        return $this->statusCode;
+    }
+
+    /**
+     * get the meta data for the result
+     * @return array
+     */
+    public function getMeta() {
+        $meta = array();
+        $meta['status'] = $this->succeeded() ? 'ok' : 'failure';
+        $meta['statuscode'] = $this->statusCode;
+        $meta['message'] = $this->message;
+        if(isset($this->items)) {
+            $meta['totalitems'] = $this->items;
+        }
+        if(isset($this->perPage)) {
+            $meta['itemsperpage'] = $this->perPage;
+        }
+        return $meta;
+
+    }
+
+    /**
+     * get the result data
+     * @return array
+     */
+    public function getData() {
+        return $this->data;
+    }
+
+    /**
+     * return bool Whether the method succeeded
+     * @return bool
+     */
+    public function succeeded() {
+        return ($this->statusCode == 100);
+    }
+
+    /**
+     * Adds a new header to the response
+     * @param string $name The name of the HTTP header
+     * @param string $value The value, null will delete it
+     * @return $this
+     */
+    public function addHeader($name, $value) {
+        $name = trim($name);  // always remove leading and trailing whitespace
+        // to be able to reliably check for security
+        // headers
+
+        if(is_null($value)) {
+            unset($this->headers[$name]);
+        } else {
+            $this->headers[$name] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the set headers
+     * @return array the headers
+     */
+    public function getHeaders() {
+        return $this->headers;
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -103,10 +103,10 @@ 
 		$meta['status'] = $this->succeeded() ? 'ok' : 'failure';
 		$meta['statuscode'] = $this->statusCode;
 		$meta['message'] = $this->message;
-		if(isset($this->items)) {
+		if (isset($this->items)) {
 			$meta['totalitems'] = $this->items;
 		}
-		if(isset($this->perPage)) {
+		if (isset($this->perPage)) {
 			$meta['itemsperpage'] = $this->perPage;
 		}
 		return $meta;
@@ -136,11 +136,11 @@ 
 	 * @return $this
 	 */
 	public function addHeader($name, $value) {
-		$name = trim($name);  // always remove leading and trailing whitespace
+		$name = trim($name); // always remove leading and trailing whitespace
 		// to be able to reliably check for security
 		// headers
 
-		if(is_null($value)) {
+		if (is_null($value)) {
 			unset($this->headers[$name]);
 		} else {
 			$this->headers[$name] = $value;

lib/private/OCS/Exception.php

Indentation +6 added lines, -6 removed lines

@@ -25,12 +25,12 @@
 
 class Exception extends \Exception {
 
-	public function __construct(Result $result) {
-		$this->result = $result;
-	}
+    public function __construct(Result $result) {
+        $this->result = $result;
+    }
 
-	public function getResult() {
-		return $this->result;
-	}
+    public function getResult() {
+        return $this->result;
+    }
 
 }