nextcloud / server

lib/private/Memcache/APC.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 	 * Set a value in the cache if it's not already stored
 	 *
 	 * @param string $key
-	 * @param mixed $value
+	 * @param integer $value
 	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
 	 * @return bool
 	 */

Indentation +90 added lines, -90 removed lines

@@ -29,108 +29,108 @@
 use OCP\IMemcache;
 
 class APC extends Cache implements IMemcache {
-	use CASTrait {
-		cas as casEmulated;
-	}
+    use CASTrait {
+        cas as casEmulated;
+    }
 
-	use CADTrait;
+    use CADTrait;
 
-	public function get($key) {
-		$result = apc_fetch($this->getPrefix() . $key, $success);
-		if (!$success) {
-			return null;
-		}
-		return $result;
-	}
+    public function get($key) {
+        $result = apc_fetch($this->getPrefix() . $key, $success);
+        if (!$success) {
+            return null;
+        }
+        return $result;
+    }
 
-	public function set($key, $value, $ttl = 0) {
-		return apc_store($this->getPrefix() . $key, $value, $ttl);
-	}
+    public function set($key, $value, $ttl = 0) {
+        return apc_store($this->getPrefix() . $key, $value, $ttl);
+    }
 
-	public function hasKey($key) {
-		return apc_exists($this->getPrefix() . $key);
-	}
+    public function hasKey($key) {
+        return apc_exists($this->getPrefix() . $key);
+    }
 
-	public function remove($key) {
-		return apc_delete($this->getPrefix() . $key);
-	}
+    public function remove($key) {
+        return apc_delete($this->getPrefix() . $key);
+    }
 
-	public function clear($prefix = '') {
-		$ns = $this->getPrefix() . $prefix;
-		$ns = preg_quote($ns, '/');
-		$iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
-		return apc_delete($iter);
-	}
+    public function clear($prefix = '') {
+        $ns = $this->getPrefix() . $prefix;
+        $ns = preg_quote($ns, '/');
+        $iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
+        return apc_delete($iter);
+    }
 
-	/**
-	 * 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) {
-		return apc_add($this->getPrefix() . $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) {
+        return apc_add($this->getPrefix() . $key, $value, $ttl);
+    }
 
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		$this->add($key, 0);
-		return apc_inc($this->getPrefix() . $key, $step);
-	}
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        $this->add($key, 0);
+        return apc_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 apc_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 apc_dec($this->getPrefix() . $key, $step);
+    }
 
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		// apc only does cas for ints
-		if (is_int($old) and is_int($new)) {
-			return apc_cas($this->getPrefix() . $key, $old, $new);
-		} else {
-			return $this->casEmulated($key, $old, $new);
-		}
-	}
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        // apc only does cas for ints
+        if (is_int($old) and is_int($new)) {
+            return apc_cas($this->getPrefix() . $key, $old, $new);
+        } else {
+            return $this->casEmulated($key, $old, $new);
+        }
+    }
 
-	static public function isAvailable() {
-		if (!extension_loaded('apc')) {
-			return false;
-		} elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
-			return false;
-		} elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
-			return false;
-		} else {
-			return true;
-		}
-	}
+    static public function isAvailable() {
+        if (!extension_loaded('apc')) {
+            return false;
+        } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
+            return false;
+        } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
+            return false;
+        } else {
+            return true;
+        }
+    }
 }
 
 if (!function_exists('apc_exists')) {
-	function apc_exists($keys) {
-		$result = false;
-		apc_fetch($keys, $result);
-		return $result;
-	}
+    function apc_exists($keys) {
+        $result = false;
+        apc_fetch($keys, $result);
+        return $result;
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -36,7 +36,7 @@ 
 	use CADTrait;
 
 	public function get($key) {
-		$result = apc_fetch($this->getPrefix() . $key, $success);
+		$result = apc_fetch($this->getPrefix().$key, $success);
 		if (!$success) {
 			return null;
 		}
@@ -44,21 +44,21 @@ 
 	}
 
 	public function set($key, $value, $ttl = 0) {
-		return apc_store($this->getPrefix() . $key, $value, $ttl);
+		return apc_store($this->getPrefix().$key, $value, $ttl);
 	}
 
 	public function hasKey($key) {
-		return apc_exists($this->getPrefix() . $key);
+		return apc_exists($this->getPrefix().$key);
 	}
 
 	public function remove($key) {
-		return apc_delete($this->getPrefix() . $key);
+		return apc_delete($this->getPrefix().$key);
 	}
 
 	public function clear($prefix = '') {
-		$ns = $this->getPrefix() . $prefix;
+		$ns = $this->getPrefix().$prefix;
 		$ns = preg_quote($ns, '/');
-		$iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
+		$iter = new \APCIterator('user', '/^'.$ns.'/', APC_ITER_KEY);
 		return apc_delete($iter);
 	}
 
@@ -71,7 +71,7 @@ 
 	 * @return bool
 	 */
 	public function add($key, $value, $ttl = 0) {
-		return apc_add($this->getPrefix() . $key, $value, $ttl);
+		return apc_add($this->getPrefix().$key, $value, $ttl);
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 */
 	public function inc($key, $step = 1) {
 		$this->add($key, 0);
-		return apc_inc($this->getPrefix() . $key, $step);
+		return apc_inc($this->getPrefix().$key, $step);
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 * @return int | bool
 	 */
 	public function dec($key, $step = 1) {
-		return apc_dec($this->getPrefix() . $key, $step);
+		return apc_dec($this->getPrefix().$key, $step);
 	}
 
 	/**
@@ -108,7 +108,7 @@ 
 	public function cas($key, $old, $new) {
 		// apc only does cas for ints
 		if (is_int($old) and is_int($new)) {
-			return apc_cas($this->getPrefix() . $key, $old, $new);
+			return apc_cas($this->getPrefix().$key, $old, $new);
 		} else {
 			return $this->casEmulated($key, $old, $new);
 		}

lib/private/Memcache/Memcached.php

Doc Comments +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 	 * Set a value in the cache if it's not already stored
 	 *
 	 * @param string $key
-	 * @param mixed $value
+	 * @param integer $value
 	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
 	 * @return bool
 	 * @throws \Exception

Indentation +186 added lines, -186 removed lines

@@ -33,190 +33,190 @@
 use OCP\IMemcache;
 
 class Memcached extends Cache implements IMemcache {
-	use CASTrait;
-
-	/**
-	 * @var \Memcached $cache
-	 */
-	private static $cache = null;
-
-	use CADTrait;
-
-	public function __construct($prefix = '') {
-		parent::__construct($prefix);
-		if (is_null(self::$cache)) {
-			self::$cache = new \Memcached();
-			$servers = \OC::$server->getSystemConfig()->getValue('memcached_servers');
-			if (!$servers) {
-				$server = \OC::$server->getSystemConfig()->getValue('memcached_server');
-				if ($server) {
-					$servers = array($server);
-				} else {
-					$servers = array(array('localhost', 11211));
-				}
-			}
-			self::$cache->addServers($servers);
-
-			$defaultOptions = [
-				\Memcached::OPT_CONNECT_TIMEOUT => 50,
-				\Memcached::OPT_RETRY_TIMEOUT =>   50,
-				\Memcached::OPT_SEND_TIMEOUT =>    50,
-				\Memcached::OPT_RECV_TIMEOUT =>    50,
-				\Memcached::OPT_POLL_TIMEOUT =>    50,
-
-				// Enable compression
-				\Memcached::OPT_COMPRESSION =>          true,
-
-				// Turn on consistent hashing
-				\Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
-
-				// Enable Binary Protocol
-				\Memcached::OPT_BINARY_PROTOCOL =>      true,
-			];
-			// by default enable igbinary serializer if available
-			if (\Memcached::HAVE_IGBINARY) {
-				$defaultOptions[\Memcached::OPT_SERIALIZER] =
-					\Memcached::SERIALIZER_IGBINARY;
-			}
-			$options = \OC::$server->getConfig()->getSystemValue('memcached_options', []);
-			if (is_array($options)) {
-				$options = $options + $defaultOptions;
-				self::$cache->setOptions($options);
-			} else {
-				throw new HintException("Expected 'memcached_options' config to be an array, got $options");
-			}
-		}
-	}
-
-	/**
-	 * entries in XCache gets 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 and self::$cache->getResultCode() == \Memcached::RES_NOTFOUND) {
-			return null;
-		} else {
-			return $result;
-		}
-	}
-
-	public function set($key, $value, $ttl = 0) {
-		if ($ttl > 0) {
-			$result =  self::$cache->set($this->getNamespace() . $key, $value, $ttl);
-		} else {
-			$result = self::$cache->set($this->getNamespace() . $key, $value);
-		}
-		$this->verifyReturnCode();
-		return $result;
-	}
-
-	public function hasKey($key) {
-		self::$cache->get($this->getNamespace() . $key);
-		return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
-	}
-
-	public function remove($key) {
-		$result= self::$cache->delete($this->getNamespace() . $key);
-		if (self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND) {
-			$this->verifyReturnCode();
-		}
-		return $result;
-	}
-
-	public function clear($prefix = '') {
-		$prefix = $this->getNamespace() . $prefix;
-		$allKeys = self::$cache->getAllKeys();
-		if ($allKeys === false) {
-			// newer Memcached doesn't like getAllKeys(), flush everything
-			self::$cache->flush();
-			return true;
-		}
-		$keys = array();
-		$prefixLength = strlen($prefix);
-		foreach ($allKeys as $key) {
-			if (substr($key, 0, $prefixLength) === $prefix) {
-				$keys[] = $key;
-			}
-		}
-		if (method_exists(self::$cache, 'deleteMulti')) {
-			self::$cache->deleteMulti($keys);
-		} else {
-			foreach ($keys as $key) {
-				self::$cache->delete($key);
-			}
-		}
-		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
-	 * @throws \Exception
-	 */
-	public function add($key, $value, $ttl = 0) {
-		$result = self::$cache->add($this->getPrefix() . $key, $value, $ttl);
-		if (self::$cache->getResultCode() !== \Memcached::RES_NOTSTORED) {
-			$this->verifyReturnCode();
-		}
-		return $result;
-	}
-
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		$this->add($key, 0);
-		$result = self::$cache->increment($this->getPrefix() . $key, $step);
-
-		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
-			return false;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Decrease a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function dec($key, $step = 1) {
-		$result = self::$cache->decrement($this->getPrefix() . $key, $step);
-
-		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
-			return false;
-		}
-
-		return $result;
-	}
-
-	static public function isAvailable() {
-		return extension_loaded('memcached');
-	}
-
-	/**
-	 * @throws \Exception
-	 */
-	private function verifyReturnCode() {
-		$code = self::$cache->getResultCode();
-		if ($code === \Memcached::RES_SUCCESS) {
-			return;
-		}
-		$message = self::$cache->getResultMessage();
-		throw new \Exception("Error $code interacting with memcached : $message");
-	}
+    use CASTrait;
+
+    /**
+     * @var \Memcached $cache
+     */
+    private static $cache = null;
+
+    use CADTrait;
+
+    public function __construct($prefix = '') {
+        parent::__construct($prefix);
+        if (is_null(self::$cache)) {
+            self::$cache = new \Memcached();
+            $servers = \OC::$server->getSystemConfig()->getValue('memcached_servers');
+            if (!$servers) {
+                $server = \OC::$server->getSystemConfig()->getValue('memcached_server');
+                if ($server) {
+                    $servers = array($server);
+                } else {
+                    $servers = array(array('localhost', 11211));
+                }
+            }
+            self::$cache->addServers($servers);
+
+            $defaultOptions = [
+                \Memcached::OPT_CONNECT_TIMEOUT => 50,
+                \Memcached::OPT_RETRY_TIMEOUT =>   50,
+                \Memcached::OPT_SEND_TIMEOUT =>    50,
+                \Memcached::OPT_RECV_TIMEOUT =>    50,
+                \Memcached::OPT_POLL_TIMEOUT =>    50,
+
+                // Enable compression
+                \Memcached::OPT_COMPRESSION =>          true,
+
+                // Turn on consistent hashing
+                \Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
+
+                // Enable Binary Protocol
+                \Memcached::OPT_BINARY_PROTOCOL =>      true,
+            ];
+            // by default enable igbinary serializer if available
+            if (\Memcached::HAVE_IGBINARY) {
+                $defaultOptions[\Memcached::OPT_SERIALIZER] =
+                    \Memcached::SERIALIZER_IGBINARY;
+            }
+            $options = \OC::$server->getConfig()->getSystemValue('memcached_options', []);
+            if (is_array($options)) {
+                $options = $options + $defaultOptions;
+                self::$cache->setOptions($options);
+            } else {
+                throw new HintException("Expected 'memcached_options' config to be an array, got $options");
+            }
+        }
+    }
+
+    /**
+     * entries in XCache gets 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 and self::$cache->getResultCode() == \Memcached::RES_NOTFOUND) {
+            return null;
+        } else {
+            return $result;
+        }
+    }
+
+    public function set($key, $value, $ttl = 0) {
+        if ($ttl > 0) {
+            $result =  self::$cache->set($this->getNamespace() . $key, $value, $ttl);
+        } else {
+            $result = self::$cache->set($this->getNamespace() . $key, $value);
+        }
+        $this->verifyReturnCode();
+        return $result;
+    }
+
+    public function hasKey($key) {
+        self::$cache->get($this->getNamespace() . $key);
+        return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
+    }
+
+    public function remove($key) {
+        $result= self::$cache->delete($this->getNamespace() . $key);
+        if (self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND) {
+            $this->verifyReturnCode();
+        }
+        return $result;
+    }
+
+    public function clear($prefix = '') {
+        $prefix = $this->getNamespace() . $prefix;
+        $allKeys = self::$cache->getAllKeys();
+        if ($allKeys === false) {
+            // newer Memcached doesn't like getAllKeys(), flush everything
+            self::$cache->flush();
+            return true;
+        }
+        $keys = array();
+        $prefixLength = strlen($prefix);
+        foreach ($allKeys as $key) {
+            if (substr($key, 0, $prefixLength) === $prefix) {
+                $keys[] = $key;
+            }
+        }
+        if (method_exists(self::$cache, 'deleteMulti')) {
+            self::$cache->deleteMulti($keys);
+        } else {
+            foreach ($keys as $key) {
+                self::$cache->delete($key);
+            }
+        }
+        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
+     * @throws \Exception
+     */
+    public function add($key, $value, $ttl = 0) {
+        $result = self::$cache->add($this->getPrefix() . $key, $value, $ttl);
+        if (self::$cache->getResultCode() !== \Memcached::RES_NOTSTORED) {
+            $this->verifyReturnCode();
+        }
+        return $result;
+    }
+
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        $this->add($key, 0);
+        $result = self::$cache->increment($this->getPrefix() . $key, $step);
+
+        if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
+            return false;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Decrease a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function dec($key, $step = 1) {
+        $result = self::$cache->decrement($this->getPrefix() . $key, $step);
+
+        if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
+            return false;
+        }
+
+        return $result;
+    }
+
+    static public function isAvailable() {
+        return extension_loaded('memcached');
+    }
+
+    /**
+     * @throws \Exception
+     */
+    private function verifyReturnCode() {
+        $code = self::$cache->getResultCode();
+        if ($code === \Memcached::RES_SUCCESS) {
+            return;
+        }
+        $message = self::$cache->getResultMessage();
+        throw new \Exception("Error $code interacting with memcached : $message");
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -96,7 +96,7 @@ 
 	}
 
 	public function get($key) {
-		$result = self::$cache->get($this->getNamespace() . $key);
+		$result = self::$cache->get($this->getNamespace().$key);
 		if ($result === false and self::$cache->getResultCode() == \Memcached::RES_NOTFOUND) {
 			return null;
 		} else {
@@ -106,21 +106,21 @@ 
 
 	public function set($key, $value, $ttl = 0) {
 		if ($ttl > 0) {
-			$result =  self::$cache->set($this->getNamespace() . $key, $value, $ttl);
+			$result = self::$cache->set($this->getNamespace().$key, $value, $ttl);
 		} else {
-			$result = self::$cache->set($this->getNamespace() . $key, $value);
+			$result = self::$cache->set($this->getNamespace().$key, $value);
 		}
 		$this->verifyReturnCode();
 		return $result;
 	}
 
 	public function hasKey($key) {
-		self::$cache->get($this->getNamespace() . $key);
+		self::$cache->get($this->getNamespace().$key);
 		return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
 	}
 
 	public function remove($key) {
-		$result= self::$cache->delete($this->getNamespace() . $key);
+		$result = self::$cache->delete($this->getNamespace().$key);
 		if (self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND) {
 			$this->verifyReturnCode();
 		}
@@ -128,7 +128,7 @@ 
 	}
 
 	public function clear($prefix = '') {
-		$prefix = $this->getNamespace() . $prefix;
+		$prefix = $this->getNamespace().$prefix;
 		$allKeys = self::$cache->getAllKeys();
 		if ($allKeys === false) {
 			// newer Memcached doesn't like getAllKeys(), flush everything
@@ -162,7 +162,7 @@ 
 	 * @throws \Exception
 	 */
 	public function add($key, $value, $ttl = 0) {
-		$result = self::$cache->add($this->getPrefix() . $key, $value, $ttl);
+		$result = self::$cache->add($this->getPrefix().$key, $value, $ttl);
 		if (self::$cache->getResultCode() !== \Memcached::RES_NOTSTORED) {
 			$this->verifyReturnCode();
 		}
@@ -178,7 +178,7 @@ 
 	 */
 	public function inc($key, $step = 1) {
 		$this->add($key, 0);
-		$result = self::$cache->increment($this->getPrefix() . $key, $step);
+		$result = self::$cache->increment($this->getPrefix().$key, $step);
 
 		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
 			return false;
@@ -195,7 +195,7 @@ 
 	 * @return int | bool
 	 */
 	public function dec($key, $step = 1) {
-		$result = self::$cache->decrement($this->getPrefix() . $key, $step);
+		$result = self::$cache->decrement($this->getPrefix().$key, $step);
 
 		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
 			return false;

lib/private/Preview.php

Doc Comments +1 added lines, -1 removed lines

@@ -923,7 +923,7 @@
 	 * @param int $previewWidth
 	 * @param int $previewHeight
 	 *
-	 * @return int[]
+	 * @return double[]
 	 */
 	private function scale($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) {
 		$scalingUp = $this->getScalingUp();

Indentation +1308 added lines, -1308 removed lines

@@ -37,1313 +37,1313 @@
 use OCP\Files\NotFoundException;
 
 class Preview {
-	//the thumbnail folder
-	const THUMBNAILS_FOLDER = 'thumbnails';
-
-	const MODE_FILL = 'fill';
-	const MODE_COVER = 'cover';
-
-	//config
-	private $maxScaleFactor;
-	/** @var int maximum width allowed for a preview */
-	private $configMaxWidth;
-	/** @var int maximum height allowed for a preview */
-	private $configMaxHeight;
-
-	//fileview object
-	private $fileView = null;
-	private $userView = null;
-
-	//vars
-	private $file;
-	private $maxX;
-	private $maxY;
-	private $scalingUp;
-	private $mimeType;
-	private $keepAspect = false;
-	private $mode = self::MODE_FILL;
-
-	//used to calculate the size of the preview to generate
-	/** @var int $maxPreviewWidth max width a preview can have */
-	private $maxPreviewWidth;
-	/** @var int $maxPreviewHeight max height a preview can have */
-	private $maxPreviewHeight;
-	/** @var int $previewWidth calculated width of the preview we're looking for */
-	private $previewWidth;
-	/** @var int $previewHeight calculated height of the preview we're looking for */
-	private $previewHeight;
-
-	//filemapper used for deleting previews
-	// index is path, value is fileinfo
-	static public $deleteFileMapper = array();
-	static public $deleteChildrenMapper = array();
-
-	/**
-	 * preview images object
-	 *
-	 * @var \OCP\IImage
-	 */
-	private $preview;
-
-	/**
-	 * @var \OCP\Files\FileInfo
-	 */
-	protected $info;
-
-	/**
-	 * check if thumbnail or bigger version of thumbnail of file is cached
-	 *
-	 * @param string $user userid - if no user is given, OC_User::getUser will be used
-	 * @param string $root path of root
-	 * @param string $file The path to the file where you want a thumbnail from
-	 * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the
-	 *     shape of the image
-	 * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the
-	 *     shape of the image
-	 * @param bool $scalingUp Disable/Enable upscaling of previews
-	 *
-	 * @throws \Exception
-	 * @return mixed (bool / string)
-	 *                    false if thumbnail does not exist
-	 *                    path to thumbnail if thumbnail exists
-	 */
-	public function __construct(
-		$user = '',
-		$root = '/',
-		$file = '', $maxX = 1,
-		$maxY = 1,
-		$scalingUp = true
-	) {
-		//init fileviews
-		if ($user === '') {
-			$user = \OC_User::getUser();
-		}
-		$this->fileView = new \OC\Files\View('/' . $user . '/' . $root);
-		$this->userView = new \OC\Files\View('/' . $user);
-
-		//set config
-		$sysConfig = \OC::$server->getConfig();
-		$this->configMaxWidth = $sysConfig->getSystemValue('preview_max_x', 2048);
-		$this->configMaxHeight = $sysConfig->getSystemValue('preview_max_y', 2048);
-		$this->maxScaleFactor = $sysConfig->getSystemValue('preview_max_scale_factor', 2);
-
-		//save parameters
-		$this->setFile($file);
-		$this->setMaxX((int)$maxX);
-		$this->setMaxY((int)$maxY);
-		$this->setScalingUp($scalingUp);
-
-		$this->preview = null;
-
-		//check if there are preview backends
-		if (!\OC::$server->getPreviewManager()
-				->hasProviders()
-			&& \OC::$server->getConfig()
-				->getSystemValue('enable_previews', true)
-		) {
-			\OCP\Util::writeLog('core', 'No preview providers exist', \OCP\Util::ERROR);
-			throw new \Exception('No preview providers');
-		}
-	}
-
-	/**
-	 * returns the path of the file you want a thumbnail from
-	 *
-	 * @return string
-	 */
-	public function getFile() {
-		return $this->file;
-	}
-
-	/**
-	 * returns the max width of the preview
-	 *
-	 * @return integer
-	 */
-	public function getMaxX() {
-		return $this->maxX;
-	}
-
-	/**
-	 * returns the max height of the preview
-	 *
-	 * @return integer
-	 */
-	public function getMaxY() {
-		return $this->maxY;
-	}
-
-	/**
-	 * returns whether or not scalingup is enabled
-	 *
-	 * @return bool
-	 */
-	public function getScalingUp() {
-		return $this->scalingUp;
-	}
-
-	/**
-	 * returns the name of the thumbnailfolder
-	 *
-	 * @return string
-	 */
-	public function getThumbnailsFolder() {
-		return self::THUMBNAILS_FOLDER;
-	}
-
-	/**
-	 * returns the max scale factor
-	 *
-	 * @return string
-	 */
-	public function getMaxScaleFactor() {
-		return $this->maxScaleFactor;
-	}
-
-	/**
-	 * returns the max width set in ownCloud's config
-	 *
-	 * @return integer
-	 */
-	public function getConfigMaxX() {
-		return $this->configMaxWidth;
-	}
-
-	/**
-	 * returns the max height set in ownCloud's config
-	 *
-	 * @return integer
-	 */
-	public function getConfigMaxY() {
-		return $this->configMaxHeight;
-	}
-
-	/**
-	 * Returns the FileInfo object associated with the file to preview
-	 *
-	 * @return false|Files\FileInfo|\OCP\Files\FileInfo
-	 */
-	protected function getFileInfo() {
-		$absPath = $this->fileView->getAbsolutePath($this->file);
-		$absPath = Files\Filesystem::normalizePath($absPath);
-		if (array_key_exists($absPath, self::$deleteFileMapper)) {
-			$this->info = self::$deleteFileMapper[$absPath];
-		} else if (!$this->info) {
-			$this->info = $this->fileView->getFileInfo($this->file);
-		}
-
-		return $this->info;
-	}
-
-
-	/**
-	 * @return array|null
-	 */
-	private function getChildren() {
-		$absPath = $this->fileView->getAbsolutePath($this->file);
-		$absPath = Files\Filesystem::normalizePath($absPath);
-
-		if (array_key_exists($absPath, self::$deleteChildrenMapper)) {
-			return self::$deleteChildrenMapper[$absPath];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Sets the path of the file you want a preview of
-	 *
-	 * @param string $file
-	 * @param \OCP\Files\FileInfo|null $info
-	 *
-	 * @return \OC\Preview
-	 */
-	public function setFile($file, $info = null) {
-		$this->file = $file;
-		$this->info = $info;
-
-		if ($file !== '') {
-			$this->getFileInfo();
-			if ($this->info instanceof \OCP\Files\FileInfo) {
-				$this->mimeType = $this->info->getMimetype();
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Forces the use of a specific media type
-	 *
-	 * @param string $mimeType
-	 */
-	public function setMimetype($mimeType) {
-		$this->mimeType = $mimeType;
-	}
-
-	/**
-	 * Sets the max width of the preview. It's capped by the maximum allowed size set in the
-	 * configuration
-	 *
-	 * @param int $maxX
-	 *
-	 * @throws \Exception
-	 * @return \OC\Preview
-	 */
-	public function setMaxX($maxX = 1) {
-		if ($maxX <= 0) {
-			throw new \Exception('Cannot set width of 0 or smaller!');
-		}
-		$configMaxX = $this->getConfigMaxX();
-		$maxX = $this->limitMaxDim($maxX, $configMaxX, 'maxX');
-		$this->maxX = $maxX;
-
-		return $this;
-	}
-
-	/**
-	 * Sets the max height of the preview. It's capped by the maximum allowed size set in the
-	 * configuration
-	 *
-	 * @param int $maxY
-	 *
-	 * @throws \Exception
-	 * @return \OC\Preview
-	 */
-	public function setMaxY($maxY = 1) {
-		if ($maxY <= 0) {
-			throw new \Exception('Cannot set height of 0 or smaller!');
-		}
-		$configMaxY = $this->getConfigMaxY();
-		$maxY = $this->limitMaxDim($maxY, $configMaxY, 'maxY');
-		$this->maxY = $maxY;
-
-		return $this;
-	}
-
-	/**
-	 * Sets whether we're allowed to scale up when generating a preview. It's capped by the maximum
-	 * allowed scale factor set in the configuration
-	 *
-	 * @param bool $scalingUp
-	 *
-	 * @return \OC\Preview
-	 */
-	public function setScalingup($scalingUp) {
-		if ($this->getMaxScaleFactor() === 1) {
-			$scalingUp = false;
-		}
-		$this->scalingUp = $scalingUp;
-
-		return $this;
-	}
-
-	/**
-	 * Set whether to cover or fill the specified dimensions
-	 *
-	 * @param string $mode
-	 *
-	 * @return \OC\Preview
-	 */
-	public function setMode($mode) {
-		$this->mode = $mode;
-
-		return $this;
-	}
-
-	/**
-	 * Sets whether we need to generate a preview which keeps the aspect ratio of the original file
-	 *
-	 * @param bool $keepAspect
-	 *
-	 * @return \OC\Preview
-	 */
-	public function setKeepAspect($keepAspect) {
-		$this->keepAspect = $keepAspect;
-
-		return $this;
-	}
-
-	/**
-	 * Makes sure we were given a file to preview and that it exists in the filesystem
-	 *
-	 * @return bool
-	 */
-	public function isFileValid() {
-		$file = $this->getFile();
-		if ($file === '') {
-			\OCP\Util::writeLog('core', 'No filename passed', \OCP\Util::DEBUG);
-
-			return false;
-		}
-
-		if (!$this->getFileInfo() instanceof FileInfo) {
-			\OCP\Util::writeLog('core', 'File:"' . $file . '" not found', \OCP\Util::DEBUG);
-
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Deletes the preview of a file with specific width and height
-	 *
-	 * This should never delete the max preview, use deleteAllPreviews() instead
-	 *
-	 * @return bool
-	 */
-	public function deletePreview() {
-		$fileInfo = $this->getFileInfo();
-		if ($fileInfo !== null && $fileInfo !== false) {
-			$fileId = $fileInfo->getId();
-
-			$previewPath = $this->buildCachePath($fileId);
-			if (!strpos($previewPath, 'max')) {
-				return $this->userView->unlink($previewPath);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Deletes all previews of a file
-	 */
-	public function deleteAllPreviews() {
-		$thumbnailMount = $this->userView->getMount($this->getThumbnailsFolder());
-		$propagator = $thumbnailMount->getStorage()->getPropagator();
-		$propagator->beginBatch();
-
-		$toDelete = $this->getChildren();
-		$toDelete[] = $this->getFileInfo();
-
-		foreach ($toDelete as $delete) {
-			if ($delete instanceof FileInfo) {
-				/** @var \OCP\Files\FileInfo $delete */
-				$fileId = $delete->getId();
-
-				// getId() might return null, e.g. when the file is a
-				// .ocTransferId*.part file from chunked file upload.
-				if (!empty($fileId)) {
-					$previewPath = $this->getPreviewPath($fileId);
-					$this->userView->rmdir($previewPath);
-				}
-			}
-		}
-
-		$propagator->commitBatch();
-	}
-
-	/**
-	 * Checks if a preview matching the asked dimensions or a bigger version is already cached
-	 *
-	 *    * We first retrieve the size of the max preview since this is what we be used to create
-	 * all our preview. If it doesn't exist we return false, so that it can be generated
-	 *    * Using the dimensions of the max preview, we calculate what the size of the new
-	 * thumbnail should be
-	 *    * And finally, we look for a suitable candidate in the cache
-	 *
-	 * @param int $fileId fileId of the original file we need a preview of
-	 *
-	 * @return string|false path to the cached preview if it exists or false
-	 */
-	public function isCached($fileId) {
-		if (is_null($fileId)) {
-			return false;
-		}
-
-		/**
-		 * Phase 1: Looking for the max preview
-		 */
-		$previewPath = $this->getPreviewPath($fileId);
-		// We currently can't look for a single file due to bugs related to #16478
-		$allThumbnails = $this->userView->getDirectoryContent($previewPath);
-		list($maxPreviewWidth, $maxPreviewHeight) = $this->getMaxPreviewSize($allThumbnails);
-
-		// Only use the cache if we have a max preview
-		if (!is_null($maxPreviewWidth) && !is_null($maxPreviewHeight)) {
-
-			/**
-			 * Phase 2: Calculating the size of the preview we need to send back
-			 */
-			$this->maxPreviewWidth = $maxPreviewWidth;
-			$this->maxPreviewHeight = $maxPreviewHeight;
-
-			list($previewWidth, $previewHeight) = $this->simulatePreviewDimensions();
-			if (empty($previewWidth) || empty($previewHeight)) {
-				return false;
-			}
-
-			$this->previewWidth = $previewWidth;
-			$this->previewHeight = $previewHeight;
-
-			/**
-			 * Phase 3: We look for a preview of the exact size
-			 */
-			// This gives us a calculated path to a preview of asked dimensions
-			// thumbnailFolder/fileId/<maxX>-<maxY>(-max|-with-aspect).png
-			$preview = $this->buildCachePath($fileId, $previewWidth, $previewHeight);
-
-			// This checks if we have a preview of those exact dimensions in the cache
-			if ($this->thumbnailSizeExists($allThumbnails, basename($preview))) {
-				return $preview;
-			}
-
-			/**
-			 * Phase 4: We look for a larger preview, matching the aspect ratio
-			 */
-			if (($this->getMaxX() >= $maxPreviewWidth)
-				&& ($this->getMaxY() >= $maxPreviewHeight)
-			) {
-				// The preview we-re looking for is the exact size or larger than the max preview,
-				// so return that
-				return $this->buildCachePath($fileId, $maxPreviewWidth, $maxPreviewHeight);
-			} else {
-				// The last resort is to look for something bigger than what we've calculated,
-				// but still smaller than the max preview
-				return $this->isCachedBigger($fileId, $allThumbnails);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the dimensions of the max preview
-	 *
-	 * @param FileInfo[] $allThumbnails the list of all our cached thumbnails
-	 *
-	 * @return int[]
-	 */
-	private function getMaxPreviewSize($allThumbnails) {
-		$maxPreviewX = null;
-		$maxPreviewY = null;
-
-		foreach ($allThumbnails as $thumbnail) {
-			$name = $thumbnail['name'];
-			if (strpos($name, 'max')) {
-				list($maxPreviewX, $maxPreviewY) = $this->getDimensionsFromFilename($name);
-				break;
-			}
-		}
-
-		return [$maxPreviewX, $maxPreviewY];
-	}
-
-	/**
-	 * Check if a specific thumbnail size is cached
-	 *
-	 * @param FileInfo[] $allThumbnails the list of all our cached thumbnails
-	 * @param string $name
-	 * @return bool
-	 */
-	private function thumbnailSizeExists(array $allThumbnails, $name) {
-
-		foreach ($allThumbnails as $thumbnail) {
-			if ($name === $thumbnail->getName()) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Determines the size of the preview we should be looking for in the cache
-	 *
-	 * @return integer[]
-	 */
-	private function simulatePreviewDimensions() {
-		$askedWidth = $this->getMaxX();
-		$askedHeight = $this->getMaxY();
-
-		if ($this->keepAspect) {
-			list($newPreviewWidth, $newPreviewHeight) =
-				$this->applyAspectRatio($askedWidth, $askedHeight);
-		} else {
-			list($newPreviewWidth, $newPreviewHeight) = $this->fixSize($askedWidth, $askedHeight);
-		}
-
-		return [(int)$newPreviewWidth, (int)$newPreviewHeight];
-	}
-
-	/**
-	 * Resizes the boundaries to match the aspect ratio
-	 *
-	 * @param int $askedWidth
-	 * @param int $askedHeight
-	 *
-	 * @param int $originalWidth
-	 * @param int $originalHeight
-	 * @return integer[]
-	 */
-	private function applyAspectRatio($askedWidth, $askedHeight, $originalWidth = 0, $originalHeight = 0) {
-		if (!$originalWidth) {
-			$originalWidth = $this->maxPreviewWidth;
-		}
-		if (!$originalHeight) {
-			$originalHeight = $this->maxPreviewHeight;
-		}
-		$originalRatio = $originalWidth / $originalHeight;
-		// Defines the box in which the preview has to fit
-		$scaleFactor = $this->scalingUp ? $this->maxScaleFactor : 1;
-		$askedWidth = min($askedWidth, $originalWidth * $scaleFactor);
-		$askedHeight = min($askedHeight, $originalHeight * $scaleFactor);
-
-		if ($askedWidth / $originalRatio < $askedHeight) {
-			// width restricted
-			$askedHeight = round($askedWidth / $originalRatio);
-		} else {
-			$askedWidth = round($askedHeight * $originalRatio);
-		}
-
-		return [(int)$askedWidth, (int)$askedHeight];
-	}
-
-	/**
-	 * Resizes the boundaries to cover the area
-	 *
-	 * @param int $askedWidth
-	 * @param int $askedHeight
-	 * @param int $previewWidth
-	 * @param int $previewHeight
-	 * @return integer[]
-	 */
-	private function applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight) {
-		$originalRatio = $previewWidth / $previewHeight;
-		// Defines the box in which the preview has to fit
-		$scaleFactor = $this->scalingUp ? $this->maxScaleFactor : 1;
-		$askedWidth = min($askedWidth, $previewWidth * $scaleFactor);
-		$askedHeight = min($askedHeight, $previewHeight * $scaleFactor);
-
-		if ($askedWidth / $originalRatio > $askedHeight) {
-			// height restricted
-			$askedHeight = round($askedWidth / $originalRatio);
-		} else {
-			$askedWidth = round($askedHeight * $originalRatio);
-		}
-
-		return [(int)$askedWidth, (int)$askedHeight];
-	}
-
-	/**
-	 * Makes sure an upscaled preview doesn't end up larger than the max dimensions defined in the
-	 * config
-	 *
-	 * @param int $askedWidth
-	 * @param int $askedHeight
-	 *
-	 * @return integer[]
-	 */
-	private function fixSize($askedWidth, $askedHeight) {
-		if ($this->scalingUp) {
-			$askedWidth = min($this->configMaxWidth, $askedWidth);
-			$askedHeight = min($this->configMaxHeight, $askedHeight);
-		}
-
-		return [(int)$askedWidth, (int)$askedHeight];
-	}
-
-	/**
-	 * Checks if a bigger version of a file preview is cached and if not
-	 * return the preview of max allowed dimensions
-	 *
-	 * @param int $fileId fileId of the original image
-	 * @param FileInfo[] $allThumbnails the list of all our cached thumbnails
-	 *
-	 * @return string path to bigger thumbnail
-	 */
-	private function isCachedBigger($fileId, $allThumbnails) {
-		// This is used to eliminate any thumbnail narrower than what we need
-		$maxX = $this->getMaxX();
-
-		//array for usable cached thumbnails
-		$possibleThumbnails = $this->getPossibleThumbnails($allThumbnails);
-
-		foreach ($possibleThumbnails as $width => $path) {
-			if ($width < $maxX) {
-				continue;
-			} else {
-				return $path;
-			}
-		}
-
-		// At this stage, we didn't find a preview, so we return the max preview
-		return $this->buildCachePath($fileId, $this->maxPreviewWidth, $this->maxPreviewHeight);
-	}
-
-	/**
-	 * Get possible bigger thumbnails of the given image with the proper aspect ratio
-	 *
-	 * @param FileInfo[] $allThumbnails the list of all our cached thumbnails
-	 *
-	 * @return string[] an array of paths to bigger thumbnails
-	 */
-	private function getPossibleThumbnails($allThumbnails) {
-		if ($this->keepAspect) {
-			$wantedAspectRatio = (float)($this->maxPreviewWidth / $this->maxPreviewHeight);
-		} else {
-			$wantedAspectRatio = (float)($this->getMaxX() / $this->getMaxY());
-		}
-
-		//array for usable cached thumbnails
-		$possibleThumbnails = array();
-		foreach ($allThumbnails as $thumbnail) {
-			$name = rtrim($thumbnail['name'], '.png');
-			list($x, $y, $aspectRatio) = $this->getDimensionsFromFilename($name);
-			if (abs($aspectRatio - $wantedAspectRatio) >= 0.000001
-				|| $this->unscalable($x, $y)
-			) {
-				continue;
-			}
-			$possibleThumbnails[$x] = $thumbnail['path'];
-		}
-
-		ksort($possibleThumbnails);
-
-		return $possibleThumbnails;
-	}
-
-	/**
-	 * Looks at the preview filename from the cache and extracts the size of the preview
-	 *
-	 * @param string $name
-	 *
-	 * @return array<int,int,float>
-	 */
-	private function getDimensionsFromFilename($name) {
-		$size = explode('-', $name);
-		$x = (int)$size[0];
-		$y = (int)$size[1];
-		$aspectRatio = (float)($x / $y);
-
-		return array($x, $y, $aspectRatio);
-	}
-
-	/**
-	 * @param int $x
-	 * @param int $y
-	 *
-	 * @return bool
-	 */
-	private function unscalable($x, $y) {
-
-		$maxX = $this->getMaxX();
-		$maxY = $this->getMaxY();
-		$scalingUp = $this->getScalingUp();
-		$maxScaleFactor = $this->getMaxScaleFactor();
-
-		if ($x < $maxX || $y < $maxY) {
-			if ($scalingUp) {
-				$scaleFactor = $maxX / $x;
-				if ($scaleFactor > $maxScaleFactor) {
-					return true;
-				}
-			} else {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns a preview of a file
-	 *
-	 * The cache is searched first and if nothing usable was found then a preview is
-	 * generated by one of the providers
-	 *
-	 * @return \OCP\IImage
-	 */
-	public function getPreview() {
-		if (!is_null($this->preview) && $this->preview->valid()) {
-			return $this->preview;
-		}
-
-		$this->preview = null;
-		$fileInfo = $this->getFileInfo();
-		if ($fileInfo === null || $fileInfo === false || !$fileInfo->isReadable()) {
-			return new \OC_Image();
-		}
-
-		$fileId = $fileInfo->getId();
-		$cached = $this->isCached($fileId);
-		if ($cached) {
-			$this->getCachedPreview($fileId, $cached);
-		}
-
-		if (is_null($this->preview)) {
-			$this->generatePreview($fileId);
-		}
-
-		// We still don't have a preview, so we send back an empty object
-		if (is_null($this->preview)) {
-			$this->preview = new \OC_Image();
-		}
-
-		return $this->preview;
-	}
-
-	/**
-	 * Sends the preview, including the headers to client which requested it
-	 *
-	 * @param null|string $mimeTypeForHeaders the media type to use when sending back the reply
-	 *
-	 * @throws NotFoundException
-	 * @throws PreviewNotAvailableException
-	 */
-	public function showPreview($mimeTypeForHeaders = null) {
-		// Check if file is valid
-		if ($this->isFileValid() === false) {
-			throw new NotFoundException('File not found.');
-		}
-
-		if (is_null($this->preview)) {
-			$this->getPreview();
-		}
-		if ($this->preview instanceof \OCP\IImage) {
-			if ($this->preview->valid()) {
-				\OCP\Response::enableCaching(3600 * 24); // 24 hours
-			} else {
-				$this->getMimeIcon();
-			}
-			$this->preview->show($mimeTypeForHeaders);
-		}
-	}
-
-	/**
-	 * Retrieves the preview from the cache and resizes it if necessary
-	 *
-	 * @param int $fileId fileId of the original image
-	 * @param string $cached the path to the cached preview
-	 */
-	private function getCachedPreview($fileId, $cached) {
-		$stream = $this->userView->fopen($cached, 'r');
-		$this->preview = null;
-		if ($stream) {
-			$image = new \OC_Image();
-			$image->loadFromFileHandle($stream);
-
-			$this->preview = $image->valid() ? $image : null;
-
-			if (!is_null($this->preview)) {
-				// Size of the preview we calculated
-				$maxX = $this->previewWidth;
-				$maxY = $this->previewHeight;
-				// Size of the preview we retrieved from the cache
-				$previewX = (int)$this->preview->width();
-				$previewY = (int)$this->preview->height();
-
-				// We don't have an exact match
-				if ($previewX !== $maxX || $previewY !== $maxY) {
-					$this->resizeAndStore($fileId);
-				}
-			}
-
-			fclose($stream);
-		}
-	}
-
-	/**
-	 * Resizes, crops, fixes orientation and stores in the cache
-	 *
-	 * @param int $fileId fileId of the original image
-	 */
-	private function resizeAndStore($fileId) {
-		$image = $this->preview;
-		if (!($image instanceof \OCP\IImage)) {
-			\OCP\Util::writeLog(
-				'core', '$this->preview is not an instance of \OCP\IImage', \OCP\Util::DEBUG
-			);
-
-			return;
-		}
-		$previewWidth = (int)$image->width();
-		$previewHeight = (int)$image->height();
-		$askedWidth = $this->getMaxX();
-		$askedHeight = $this->getMaxY();
-
-		if ($this->mode === self::MODE_COVER) {
-			list($askedWidth, $askedHeight) =
-				$this->applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight);
-		}
-
-		/**
-		 * Phase 1: If required, adjust boundaries to keep aspect ratio
-		 */
-		if ($this->keepAspect) {
-			list($askedWidth, $askedHeight) =
-				$this->applyAspectRatio($askedWidth, $askedHeight, $previewWidth, $previewHeight);
-		}
-
-		/**
-		 * Phase 2: Resizes preview to try and match requirements.
-		 * Takes the scaling ratio into consideration
-		 */
-		list($newPreviewWidth, $newPreviewHeight) = $this->scale(
-			$image, $askedWidth, $askedHeight, $previewWidth, $previewHeight
-		);
-
-		// The preview has been resized and should now have the asked dimensions
-		if ($newPreviewWidth === $askedWidth && $newPreviewHeight === $askedHeight) {
-			$this->storePreview($fileId, $newPreviewWidth, $newPreviewHeight);
-
-			return;
-		}
-
-		/**
-		 * Phase 3: We're still not there yet, so we're clipping and filling
-		 * to match the asked dimensions
-		 */
-		// It turns out the scaled preview is now too big, so we crop the image
-		if ($newPreviewWidth >= $askedWidth && $newPreviewHeight >= $askedHeight) {
-			$this->crop($image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight);
-			$this->storePreview($fileId, $askedWidth, $askedHeight);
-
-			return;
-		}
-
-		// At least one dimension of the scaled preview is too small,
-		// so we fill the space with a transparent background
-		if (($newPreviewWidth < $askedWidth || $newPreviewHeight < $askedHeight)) {
-			$this->cropAndFill(
-				$image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight
-			);
-			$this->storePreview($fileId, $askedWidth, $askedHeight);
-
-			return;
-		}
-
-		// The preview is smaller, but we can't touch it
-		$this->storePreview($fileId, $newPreviewWidth, $newPreviewHeight);
-	}
-
-	/**
-	 * Calculates the new dimensions of the preview
-	 *
-	 * The new dimensions can be larger or smaller than the ones of the preview we have to resize
-	 *
-	 * @param \OCP\IImage $image
-	 * @param int $askedWidth
-	 * @param int $askedHeight
-	 * @param int $previewWidth
-	 * @param int $previewHeight
-	 *
-	 * @return int[]
-	 */
-	private function scale($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) {
-		$scalingUp = $this->getScalingUp();
-		$maxScaleFactor = $this->getMaxScaleFactor();
-
-		$factorX = $askedWidth / $previewWidth;
-		$factorY = $askedHeight / $previewHeight;
-
-		if ($factorX >= $factorY) {
-			$factor = $factorX;
-		} else {
-			$factor = $factorY;
-		}
-
-		if ($scalingUp === false) {
-			if ($factor > 1) {
-				$factor = 1;
-			}
-		}
-
-		// We cap when upscaling
-		if (!is_null($maxScaleFactor)) {
-			if ($factor > $maxScaleFactor) {
-				\OCP\Util::writeLog(
-					'core', 'scale factor reduced from ' . $factor . ' to ' . $maxScaleFactor,
-					\OCP\Util::DEBUG
-				);
-				$factor = $maxScaleFactor;
-			}
-		}
-
-		$newPreviewWidth = round($previewWidth * $factor);
-		$newPreviewHeight = round($previewHeight * $factor);
-
-		$image->preciseResize($newPreviewWidth, $newPreviewHeight);
-		$this->preview = $image;
-
-		return [$newPreviewWidth, $newPreviewHeight];
-	}
-
-	/**
-	 * Crops a preview which is larger than the dimensions we've received
-	 *
-	 * @param \OCP\IImage $image
-	 * @param int $askedWidth
-	 * @param int $askedHeight
-	 * @param int $previewWidth
-	 * @param int $previewHeight
-	 */
-	private function crop($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight = null) {
-		$cropX = floor(abs($askedWidth - $previewWidth) * 0.5);
-		//don't crop previews on the Y axis, this sucks if it's a document.
-		//$cropY = floor(abs($y - $newPreviewHeight) * 0.5);
-		$cropY = 0;
-		$image->crop($cropX, $cropY, $askedWidth, $askedHeight);
-		$this->preview = $image;
-	}
-
-	/**
-	 * Crops an image if it's larger than the dimensions we've received and fills the empty space
-	 * with a transparent background
-	 *
-	 * @param \OCP\IImage $image
-	 * @param int $askedWidth
-	 * @param int $askedHeight
-	 * @param int $previewWidth
-	 * @param int $previewHeight
-	 */
-	private function cropAndFill($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) {
-		if ($previewWidth > $askedWidth) {
-			$cropX = floor(($previewWidth - $askedWidth) * 0.5);
-			$image->crop($cropX, 0, $askedWidth, $previewHeight);
-			$previewWidth = $askedWidth;
-		}
-
-		if ($previewHeight > $askedHeight) {
-			$cropY = floor(($previewHeight - $askedHeight) * 0.5);
-			$image->crop(0, $cropY, $previewWidth, $askedHeight);
-			$previewHeight = $askedHeight;
-		}
-
-		// Creates a transparent background
-		$backgroundLayer = imagecreatetruecolor($askedWidth, $askedHeight);
-		imagealphablending($backgroundLayer, false);
-		$transparency = imagecolorallocatealpha($backgroundLayer, 0, 0, 0, 127);
-		imagefill($backgroundLayer, 0, 0, $transparency);
-		imagesavealpha($backgroundLayer, true);
-
-		$image = $image->resource();
-
-		$mergeX = floor(abs($askedWidth - $previewWidth) * 0.5);
-		$mergeY = floor(abs($askedHeight - $previewHeight) * 0.5);
-
-		// Pastes the preview on top of the background
-		imagecopy(
-			$backgroundLayer, $image, $mergeX, $mergeY, 0, 0, $previewWidth,
-			$previewHeight
-		);
-
-		$image = new \OC_Image($backgroundLayer);
-
-		$this->preview = $image;
-	}
-
-	/**
-	 * Saves a preview in the cache to speed up future calls
-	 *
-	 * Do not nullify the preview as it might send the whole process in a loop
-	 *
-	 * @param int $fileId fileId of the original image
-	 * @param int $previewWidth
-	 * @param int $previewHeight
-	 */
-	private function storePreview($fileId, $previewWidth, $previewHeight) {
-		if (empty($previewWidth) || empty($previewHeight)) {
-			\OCP\Util::writeLog(
-				'core', 'Cannot save preview of dimension ' . $previewWidth . 'x' . $previewHeight,
-				\OCP\Util::DEBUG
-			);
-
-		} else {
-			$cachePath = $this->buildCachePath($fileId, $previewWidth, $previewHeight);
-			$this->userView->file_put_contents($cachePath, $this->preview->data());
-		}
-	}
-
-	/**
-	 * Returns the path to a preview based on its dimensions and aspect
-	 *
-	 * @param int $fileId
-	 * @param int|null $maxX
-	 * @param int|null $maxY
-	 *
-	 * @return string
-	 */
-	private function buildCachePath($fileId, $maxX = null, $maxY = null) {
-		if (is_null($maxX)) {
-			$maxX = $this->getMaxX();
-		}
-		if (is_null($maxY)) {
-			$maxY = $this->getMaxY();
-		}
-
-		$previewPath = $this->getPreviewPath($fileId);
-		$previewPath = $previewPath . strval($maxX) . '-' . strval($maxY);
-		$isMaxPreview =
-			($maxX === $this->maxPreviewWidth && $maxY === $this->maxPreviewHeight) ? true : false;
-		if ($isMaxPreview) {
-			$previewPath .= '-max';
-		}
-		if ($this->keepAspect && !$isMaxPreview) {
-			$previewPath .= '-with-aspect';
-		}
-		if ($this->mode === self::MODE_COVER) {
-			$previewPath .= '-cover';
-		}
-		$previewPath .= '.png';
-
-		return $previewPath;
-	}
-
-	/**
-	 * Returns the path to the folder where the previews are stored, identified by the fileId
-	 *
-	 * @param int $fileId
-	 *
-	 * @return string
-	 */
-	private function getPreviewPath($fileId) {
-		return $this->getThumbnailsFolder() . '/' . $fileId . '/';
-	}
-
-	/**
-	 * Asks the provider to send a preview of the file which respects the maximum dimensions
-	 * defined in the configuration and after saving it in the cache, it is then resized to the
-	 * asked dimensions
-	 *
-	 * This is only called once in order to generate a large PNG of dimensions defined in the
-	 * configuration file. We'll be able to quickly resize it later on.
-	 * We never upscale the original conversion as this will be done later by the resizing
-	 * operation
-	 *
-	 * @param int $fileId fileId of the original image
-	 */
-	private function generatePreview($fileId) {
-		$file = $this->getFile();
-		$preview = null;
-
-		$previewProviders = \OC::$server->getPreviewManager()
-			->getProviders();
-		foreach ($previewProviders as $supportedMimeType => $providers) {
-			if (!preg_match($supportedMimeType, $this->mimeType)) {
-				continue;
-			}
-
-			foreach ($providers as $closure) {
-				$provider = $closure();
-				if (!($provider instanceof \OCP\Preview\IProvider)) {
-					continue;
-				}
-
-				\OCP\Util::writeLog(
-					'core', 'Generating preview for "' . $file . '" with "' . get_class($provider)
-					. '"', \OCP\Util::DEBUG
-				);
-
-				/** @var $provider Provider */
-				$preview = $provider->getThumbnail(
-					$file, $this->configMaxWidth, $this->configMaxHeight, $scalingUp = false,
-					$this->fileView
-				);
-
-				if (!($preview instanceof \OCP\IImage)) {
-					continue;
-				}
-
-				$this->preview = $preview;
-				$previewPath = $this->getPreviewPath($fileId);
-
-				if ($this->userView->is_dir($this->getThumbnailsFolder() . '/') === false) {
-					$this->userView->mkdir($this->getThumbnailsFolder() . '/');
-				}
-
-				if ($this->userView->is_dir($previewPath) === false) {
-					$this->userView->mkdir($previewPath);
-				}
-
-				// This stores our large preview so that it can be used in subsequent resizing requests
-				$this->storeMaxPreview($previewPath);
-
-				break 2;
-			}
-		}
-
-		// The providers have been kind enough to give us a preview
-		if ($preview) {
-			$this->resizeAndStore($fileId);
-		}
-	}
-
-	/**
-	 * Defines the media icon, for the media type of the original file, as the preview
-	 * @throws PreviewNotAvailableException
-	 */
-	private function getMimeIcon() {
-		$image = new \OC_Image();
-		$mimeIconWebPath = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($this->mimeType);
-		if (empty(\OC::$WEBROOT)) {
-			$mimeIconServerPath = \OC::$SERVERROOT . $mimeIconWebPath;
-		} else {
-			$mimeIconServerPath = str_replace(\OC::$WEBROOT, \OC::$SERVERROOT, $mimeIconWebPath);
-		}
-		// we can't load SVGs into an image
-		if (substr($mimeIconWebPath, -4) === '.svg') {
-			throw new PreviewNotAvailableException('SVG mimetype cannot be rendered');
-		}
-		$image->loadFromFile($mimeIconServerPath);
-
-		$this->preview = $image;
-	}
-
-	/**
-	 * Stores the max preview in the cache
-	 *
-	 * @param string $previewPath path to the preview
-	 */
-	private function storeMaxPreview($previewPath) {
-		$maxPreviewExists = false;
-		$preview = $this->preview;
-
-		$allThumbnails = $this->userView->getDirectoryContent($previewPath);
-		// This is so that the cache doesn't need emptying when upgrading
-		// Can be replaced by an upgrade script...
-		foreach ($allThumbnails as $thumbnail) {
-			$name = rtrim($thumbnail['name'], '.png');
-			if (strpos($name, 'max')) {
-				$maxPreviewExists = true;
-				break;
-			}
-		}
-		// We haven't found the max preview, so we create it
-		if (!$maxPreviewExists) {
-			$previewWidth = $preview->width();
-			$previewHeight = $preview->height();
-			$previewPath = $previewPath . strval($previewWidth) . '-' . strval($previewHeight);
-			$previewPath .= '-max.png';
-			$this->userView->file_put_contents($previewPath, $preview->data());
-			$this->maxPreviewWidth = $previewWidth;
-			$this->maxPreviewHeight = $previewHeight;
-		}
-	}
-
-	/**
-	 * Limits a dimension to the maximum dimension provided as argument
-	 *
-	 * @param int $dim
-	 * @param int $maxDim
-	 * @param string $dimName
-	 *
-	 * @return integer
-	 */
-	private function limitMaxDim($dim, $maxDim, $dimName) {
-		if (!is_null($maxDim)) {
-			if ($dim > $maxDim) {
-				\OCP\Util::writeLog(
-					'core', $dimName . ' reduced from ' . $dim . ' to ' . $maxDim, \OCP\Util::DEBUG
-				);
-				$dim = $maxDim;
-			}
-		}
-
-		return $dim;
-	}
-
-	/**
-	 * @param array $args
-	 */
-	public static function post_write($args) {
-		self::post_delete($args, 'files/');
-	}
-
-	/**
-	 * @param array $args
-	 */
-	public static function prepare_delete_files($args) {
-		self::prepare_delete($args, 'files/');
-	}
-
-	/**
-	 * @param array $args
-	 * @param string $prefix
-	 */
-	public static function prepare_delete(array $args, $prefix = '') {
-		$path = $args['path'];
-		if (substr($path, 0, 1) === '/') {
-			$path = substr($path, 1);
-		}
-
-		$view = new \OC\Files\View('/' . \OC_User::getUser() . '/' . $prefix);
-
-		$absPath = Files\Filesystem::normalizePath($view->getAbsolutePath($path));
-		$fileInfo = $view->getFileInfo($path);
-		if ($fileInfo === false) {
-			return;
-		}
-		self::addPathToDeleteFileMapper($absPath, $fileInfo);
-		if ($view->is_dir($path)) {
-			$children = self::getAllChildren($view, $path);
-			self::$deleteChildrenMapper[$absPath] = $children;
-		}
-	}
-
-	/**
-	 * @param string $absolutePath
-	 * @param \OCP\Files\FileInfo $info
-	 */
-	private static function addPathToDeleteFileMapper($absolutePath, $info) {
-		self::$deleteFileMapper[$absolutePath] = $info;
-	}
-
-	/**
-	 * @param \OC\Files\View $view
-	 * @param string $path
-	 *
-	 * @return array
-	 */
-	private static function getAllChildren($view, $path) {
-		$children = $view->getDirectoryContent($path);
-		$childrensFiles = array();
-
-		$fakeRootLength = strlen($view->getRoot());
-
-		for ($i = 0; $i < count($children); $i++) {
-			$child = $children[$i];
-
-			$childsPath = substr($child->getPath(), $fakeRootLength);
-
-			if ($view->is_dir($childsPath)) {
-				$children = array_merge(
-					$children,
-					$view->getDirectoryContent($childsPath)
-				);
-			} else {
-				$childrensFiles[] = $child;
-			}
-		}
-
-		return $childrensFiles;
-	}
-
-	/**
-	 * @param array $args
-	 */
-	public static function post_delete_files($args) {
-		self::post_delete($args, 'files/');
-	}
-
-	/**
-	 * @param array $args
-	 */
-	public static function post_delete_versions($args) {
-		self::post_delete($args, 'files/');
-	}
-
-	/**
-	 * @param array $args
-	 * @param string $prefix
-	 */
-	public static function post_delete($args, $prefix = '') {
-		$path = Files\Filesystem::normalizePath($args['path']);
-
-		$preview = new Preview(\OC_User::getUser(), $prefix, $path);
-		$preview->deleteAllPreviews();
-	}
+    //the thumbnail folder
+    const THUMBNAILS_FOLDER = 'thumbnails';
+
+    const MODE_FILL = 'fill';
+    const MODE_COVER = 'cover';
+
+    //config
+    private $maxScaleFactor;
+    /** @var int maximum width allowed for a preview */
+    private $configMaxWidth;
+    /** @var int maximum height allowed for a preview */
+    private $configMaxHeight;
+
+    //fileview object
+    private $fileView = null;
+    private $userView = null;
+
+    //vars
+    private $file;
+    private $maxX;
+    private $maxY;
+    private $scalingUp;
+    private $mimeType;
+    private $keepAspect = false;
+    private $mode = self::MODE_FILL;
+
+    //used to calculate the size of the preview to generate
+    /** @var int $maxPreviewWidth max width a preview can have */
+    private $maxPreviewWidth;
+    /** @var int $maxPreviewHeight max height a preview can have */
+    private $maxPreviewHeight;
+    /** @var int $previewWidth calculated width of the preview we're looking for */
+    private $previewWidth;
+    /** @var int $previewHeight calculated height of the preview we're looking for */
+    private $previewHeight;
+
+    //filemapper used for deleting previews
+    // index is path, value is fileinfo
+    static public $deleteFileMapper = array();
+    static public $deleteChildrenMapper = array();
+
+    /**
+     * preview images object
+     *
+     * @var \OCP\IImage
+     */
+    private $preview;
+
+    /**
+     * @var \OCP\Files\FileInfo
+     */
+    protected $info;
+
+    /**
+     * check if thumbnail or bigger version of thumbnail of file is cached
+     *
+     * @param string $user userid - if no user is given, OC_User::getUser will be used
+     * @param string $root path of root
+     * @param string $file The path to the file where you want a thumbnail from
+     * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the
+     *     shape of the image
+     * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the
+     *     shape of the image
+     * @param bool $scalingUp Disable/Enable upscaling of previews
+     *
+     * @throws \Exception
+     * @return mixed (bool / string)
+     *                    false if thumbnail does not exist
+     *                    path to thumbnail if thumbnail exists
+     */
+    public function __construct(
+        $user = '',
+        $root = '/',
+        $file = '', $maxX = 1,
+        $maxY = 1,
+        $scalingUp = true
+    ) {
+        //init fileviews
+        if ($user === '') {
+            $user = \OC_User::getUser();
+        }
+        $this->fileView = new \OC\Files\View('/' . $user . '/' . $root);
+        $this->userView = new \OC\Files\View('/' . $user);
+
+        //set config
+        $sysConfig = \OC::$server->getConfig();
+        $this->configMaxWidth = $sysConfig->getSystemValue('preview_max_x', 2048);
+        $this->configMaxHeight = $sysConfig->getSystemValue('preview_max_y', 2048);
+        $this->maxScaleFactor = $sysConfig->getSystemValue('preview_max_scale_factor', 2);
+
+        //save parameters
+        $this->setFile($file);
+        $this->setMaxX((int)$maxX);
+        $this->setMaxY((int)$maxY);
+        $this->setScalingUp($scalingUp);
+
+        $this->preview = null;
+
+        //check if there are preview backends
+        if (!\OC::$server->getPreviewManager()
+                ->hasProviders()
+            && \OC::$server->getConfig()
+                ->getSystemValue('enable_previews', true)
+        ) {
+            \OCP\Util::writeLog('core', 'No preview providers exist', \OCP\Util::ERROR);
+            throw new \Exception('No preview providers');
+        }
+    }
+
+    /**
+     * returns the path of the file you want a thumbnail from
+     *
+     * @return string
+     */
+    public function getFile() {
+        return $this->file;
+    }
+
+    /**
+     * returns the max width of the preview
+     *
+     * @return integer
+     */
+    public function getMaxX() {
+        return $this->maxX;
+    }
+
+    /**
+     * returns the max height of the preview
+     *
+     * @return integer
+     */
+    public function getMaxY() {
+        return $this->maxY;
+    }
+
+    /**
+     * returns whether or not scalingup is enabled
+     *
+     * @return bool
+     */
+    public function getScalingUp() {
+        return $this->scalingUp;
+    }
+
+    /**
+     * returns the name of the thumbnailfolder
+     *
+     * @return string
+     */
+    public function getThumbnailsFolder() {
+        return self::THUMBNAILS_FOLDER;
+    }
+
+    /**
+     * returns the max scale factor
+     *
+     * @return string
+     */
+    public function getMaxScaleFactor() {
+        return $this->maxScaleFactor;
+    }
+
+    /**
+     * returns the max width set in ownCloud's config
+     *
+     * @return integer
+     */
+    public function getConfigMaxX() {
+        return $this->configMaxWidth;
+    }
+
+    /**
+     * returns the max height set in ownCloud's config
+     *
+     * @return integer
+     */
+    public function getConfigMaxY() {
+        return $this->configMaxHeight;
+    }
+
+    /**
+     * Returns the FileInfo object associated with the file to preview
+     *
+     * @return false|Files\FileInfo|\OCP\Files\FileInfo
+     */
+    protected function getFileInfo() {
+        $absPath = $this->fileView->getAbsolutePath($this->file);
+        $absPath = Files\Filesystem::normalizePath($absPath);
+        if (array_key_exists($absPath, self::$deleteFileMapper)) {
+            $this->info = self::$deleteFileMapper[$absPath];
+        } else if (!$this->info) {
+            $this->info = $this->fileView->getFileInfo($this->file);
+        }
+
+        return $this->info;
+    }
+
+
+    /**
+     * @return array|null
+     */
+    private function getChildren() {
+        $absPath = $this->fileView->getAbsolutePath($this->file);
+        $absPath = Files\Filesystem::normalizePath($absPath);
+
+        if (array_key_exists($absPath, self::$deleteChildrenMapper)) {
+            return self::$deleteChildrenMapper[$absPath];
+        }
+
+        return null;
+    }
+
+    /**
+     * Sets the path of the file you want a preview of
+     *
+     * @param string $file
+     * @param \OCP\Files\FileInfo|null $info
+     *
+     * @return \OC\Preview
+     */
+    public function setFile($file, $info = null) {
+        $this->file = $file;
+        $this->info = $info;
+
+        if ($file !== '') {
+            $this->getFileInfo();
+            if ($this->info instanceof \OCP\Files\FileInfo) {
+                $this->mimeType = $this->info->getMimetype();
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Forces the use of a specific media type
+     *
+     * @param string $mimeType
+     */
+    public function setMimetype($mimeType) {
+        $this->mimeType = $mimeType;
+    }
+
+    /**
+     * Sets the max width of the preview. It's capped by the maximum allowed size set in the
+     * configuration
+     *
+     * @param int $maxX
+     *
+     * @throws \Exception
+     * @return \OC\Preview
+     */
+    public function setMaxX($maxX = 1) {
+        if ($maxX <= 0) {
+            throw new \Exception('Cannot set width of 0 or smaller!');
+        }
+        $configMaxX = $this->getConfigMaxX();
+        $maxX = $this->limitMaxDim($maxX, $configMaxX, 'maxX');
+        $this->maxX = $maxX;
+
+        return $this;
+    }
+
+    /**
+     * Sets the max height of the preview. It's capped by the maximum allowed size set in the
+     * configuration
+     *
+     * @param int $maxY
+     *
+     * @throws \Exception
+     * @return \OC\Preview
+     */
+    public function setMaxY($maxY = 1) {
+        if ($maxY <= 0) {
+            throw new \Exception('Cannot set height of 0 or smaller!');
+        }
+        $configMaxY = $this->getConfigMaxY();
+        $maxY = $this->limitMaxDim($maxY, $configMaxY, 'maxY');
+        $this->maxY = $maxY;
+
+        return $this;
+    }
+
+    /**
+     * Sets whether we're allowed to scale up when generating a preview. It's capped by the maximum
+     * allowed scale factor set in the configuration
+     *
+     * @param bool $scalingUp
+     *
+     * @return \OC\Preview
+     */
+    public function setScalingup($scalingUp) {
+        if ($this->getMaxScaleFactor() === 1) {
+            $scalingUp = false;
+        }
+        $this->scalingUp = $scalingUp;
+
+        return $this;
+    }
+
+    /**
+     * Set whether to cover or fill the specified dimensions
+     *
+     * @param string $mode
+     *
+     * @return \OC\Preview
+     */
+    public function setMode($mode) {
+        $this->mode = $mode;
+
+        return $this;
+    }
+
+    /**
+     * Sets whether we need to generate a preview which keeps the aspect ratio of the original file
+     *
+     * @param bool $keepAspect
+     *
+     * @return \OC\Preview
+     */
+    public function setKeepAspect($keepAspect) {
+        $this->keepAspect = $keepAspect;
+
+        return $this;
+    }
+
+    /**
+     * Makes sure we were given a file to preview and that it exists in the filesystem
+     *
+     * @return bool
+     */
+    public function isFileValid() {
+        $file = $this->getFile();
+        if ($file === '') {
+            \OCP\Util::writeLog('core', 'No filename passed', \OCP\Util::DEBUG);
+
+            return false;
+        }
+
+        if (!$this->getFileInfo() instanceof FileInfo) {
+            \OCP\Util::writeLog('core', 'File:"' . $file . '" not found', \OCP\Util::DEBUG);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Deletes the preview of a file with specific width and height
+     *
+     * This should never delete the max preview, use deleteAllPreviews() instead
+     *
+     * @return bool
+     */
+    public function deletePreview() {
+        $fileInfo = $this->getFileInfo();
+        if ($fileInfo !== null && $fileInfo !== false) {
+            $fileId = $fileInfo->getId();
+
+            $previewPath = $this->buildCachePath($fileId);
+            if (!strpos($previewPath, 'max')) {
+                return $this->userView->unlink($previewPath);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Deletes all previews of a file
+     */
+    public function deleteAllPreviews() {
+        $thumbnailMount = $this->userView->getMount($this->getThumbnailsFolder());
+        $propagator = $thumbnailMount->getStorage()->getPropagator();
+        $propagator->beginBatch();
+
+        $toDelete = $this->getChildren();
+        $toDelete[] = $this->getFileInfo();
+
+        foreach ($toDelete as $delete) {
+            if ($delete instanceof FileInfo) {
+                /** @var \OCP\Files\FileInfo $delete */
+                $fileId = $delete->getId();
+
+                // getId() might return null, e.g. when the file is a
+                // .ocTransferId*.part file from chunked file upload.
+                if (!empty($fileId)) {
+                    $previewPath = $this->getPreviewPath($fileId);
+                    $this->userView->rmdir($previewPath);
+                }
+            }
+        }
+
+        $propagator->commitBatch();
+    }
+
+    /**
+     * Checks if a preview matching the asked dimensions or a bigger version is already cached
+     *
+     *    * We first retrieve the size of the max preview since this is what we be used to create
+     * all our preview. If it doesn't exist we return false, so that it can be generated
+     *    * Using the dimensions of the max preview, we calculate what the size of the new
+     * thumbnail should be
+     *    * And finally, we look for a suitable candidate in the cache
+     *
+     * @param int $fileId fileId of the original file we need a preview of
+     *
+     * @return string|false path to the cached preview if it exists or false
+     */
+    public function isCached($fileId) {
+        if (is_null($fileId)) {
+            return false;
+        }
+
+        /**
+         * Phase 1: Looking for the max preview
+         */
+        $previewPath = $this->getPreviewPath($fileId);
+        // We currently can't look for a single file due to bugs related to #16478
+        $allThumbnails = $this->userView->getDirectoryContent($previewPath);
+        list($maxPreviewWidth, $maxPreviewHeight) = $this->getMaxPreviewSize($allThumbnails);
+
+        // Only use the cache if we have a max preview
+        if (!is_null($maxPreviewWidth) && !is_null($maxPreviewHeight)) {
+
+            /**
+             * Phase 2: Calculating the size of the preview we need to send back
+             */
+            $this->maxPreviewWidth = $maxPreviewWidth;
+            $this->maxPreviewHeight = $maxPreviewHeight;
+
+            list($previewWidth, $previewHeight) = $this->simulatePreviewDimensions();
+            if (empty($previewWidth) || empty($previewHeight)) {
+                return false;
+            }
+
+            $this->previewWidth = $previewWidth;
+            $this->previewHeight = $previewHeight;
+
+            /**
+             * Phase 3: We look for a preview of the exact size
+             */
+            // This gives us a calculated path to a preview of asked dimensions
+            // thumbnailFolder/fileId/<maxX>-<maxY>(-max|-with-aspect).png
+            $preview = $this->buildCachePath($fileId, $previewWidth, $previewHeight);
+
+            // This checks if we have a preview of those exact dimensions in the cache
+            if ($this->thumbnailSizeExists($allThumbnails, basename($preview))) {
+                return $preview;
+            }
+
+            /**
+             * Phase 4: We look for a larger preview, matching the aspect ratio
+             */
+            if (($this->getMaxX() >= $maxPreviewWidth)
+                && ($this->getMaxY() >= $maxPreviewHeight)
+            ) {
+                // The preview we-re looking for is the exact size or larger than the max preview,
+                // so return that
+                return $this->buildCachePath($fileId, $maxPreviewWidth, $maxPreviewHeight);
+            } else {
+                // The last resort is to look for something bigger than what we've calculated,
+                // but still smaller than the max preview
+                return $this->isCachedBigger($fileId, $allThumbnails);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the dimensions of the max preview
+     *
+     * @param FileInfo[] $allThumbnails the list of all our cached thumbnails
+     *
+     * @return int[]
+     */
+    private function getMaxPreviewSize($allThumbnails) {
+        $maxPreviewX = null;
+        $maxPreviewY = null;
+
+        foreach ($allThumbnails as $thumbnail) {
+            $name = $thumbnail['name'];
+            if (strpos($name, 'max')) {
+                list($maxPreviewX, $maxPreviewY) = $this->getDimensionsFromFilename($name);
+                break;
+            }
+        }
+
+        return [$maxPreviewX, $maxPreviewY];
+    }
+
+    /**
+     * Check if a specific thumbnail size is cached
+     *
+     * @param FileInfo[] $allThumbnails the list of all our cached thumbnails
+     * @param string $name
+     * @return bool
+     */
+    private function thumbnailSizeExists(array $allThumbnails, $name) {
+
+        foreach ($allThumbnails as $thumbnail) {
+            if ($name === $thumbnail->getName()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Determines the size of the preview we should be looking for in the cache
+     *
+     * @return integer[]
+     */
+    private function simulatePreviewDimensions() {
+        $askedWidth = $this->getMaxX();
+        $askedHeight = $this->getMaxY();
+
+        if ($this->keepAspect) {
+            list($newPreviewWidth, $newPreviewHeight) =
+                $this->applyAspectRatio($askedWidth, $askedHeight);
+        } else {
+            list($newPreviewWidth, $newPreviewHeight) = $this->fixSize($askedWidth, $askedHeight);
+        }
+
+        return [(int)$newPreviewWidth, (int)$newPreviewHeight];
+    }
+
+    /**
+     * Resizes the boundaries to match the aspect ratio
+     *
+     * @param int $askedWidth
+     * @param int $askedHeight
+     *
+     * @param int $originalWidth
+     * @param int $originalHeight
+     * @return integer[]
+     */
+    private function applyAspectRatio($askedWidth, $askedHeight, $originalWidth = 0, $originalHeight = 0) {
+        if (!$originalWidth) {
+            $originalWidth = $this->maxPreviewWidth;
+        }
+        if (!$originalHeight) {
+            $originalHeight = $this->maxPreviewHeight;
+        }
+        $originalRatio = $originalWidth / $originalHeight;
+        // Defines the box in which the preview has to fit
+        $scaleFactor = $this->scalingUp ? $this->maxScaleFactor : 1;
+        $askedWidth = min($askedWidth, $originalWidth * $scaleFactor);
+        $askedHeight = min($askedHeight, $originalHeight * $scaleFactor);
+
+        if ($askedWidth / $originalRatio < $askedHeight) {
+            // width restricted
+            $askedHeight = round($askedWidth / $originalRatio);
+        } else {
+            $askedWidth = round($askedHeight * $originalRatio);
+        }
+
+        return [(int)$askedWidth, (int)$askedHeight];
+    }
+
+    /**
+     * Resizes the boundaries to cover the area
+     *
+     * @param int $askedWidth
+     * @param int $askedHeight
+     * @param int $previewWidth
+     * @param int $previewHeight
+     * @return integer[]
+     */
+    private function applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight) {
+        $originalRatio = $previewWidth / $previewHeight;
+        // Defines the box in which the preview has to fit
+        $scaleFactor = $this->scalingUp ? $this->maxScaleFactor : 1;
+        $askedWidth = min($askedWidth, $previewWidth * $scaleFactor);
+        $askedHeight = min($askedHeight, $previewHeight * $scaleFactor);
+
+        if ($askedWidth / $originalRatio > $askedHeight) {
+            // height restricted
+            $askedHeight = round($askedWidth / $originalRatio);
+        } else {
+            $askedWidth = round($askedHeight * $originalRatio);
+        }
+
+        return [(int)$askedWidth, (int)$askedHeight];
+    }
+
+    /**
+     * Makes sure an upscaled preview doesn't end up larger than the max dimensions defined in the
+     * config
+     *
+     * @param int $askedWidth
+     * @param int $askedHeight
+     *
+     * @return integer[]
+     */
+    private function fixSize($askedWidth, $askedHeight) {
+        if ($this->scalingUp) {
+            $askedWidth = min($this->configMaxWidth, $askedWidth);
+            $askedHeight = min($this->configMaxHeight, $askedHeight);
+        }
+
+        return [(int)$askedWidth, (int)$askedHeight];
+    }
+
+    /**
+     * Checks if a bigger version of a file preview is cached and if not
+     * return the preview of max allowed dimensions
+     *
+     * @param int $fileId fileId of the original image
+     * @param FileInfo[] $allThumbnails the list of all our cached thumbnails
+     *
+     * @return string path to bigger thumbnail
+     */
+    private function isCachedBigger($fileId, $allThumbnails) {
+        // This is used to eliminate any thumbnail narrower than what we need
+        $maxX = $this->getMaxX();
+
+        //array for usable cached thumbnails
+        $possibleThumbnails = $this->getPossibleThumbnails($allThumbnails);
+
+        foreach ($possibleThumbnails as $width => $path) {
+            if ($width < $maxX) {
+                continue;
+            } else {
+                return $path;
+            }
+        }
+
+        // At this stage, we didn't find a preview, so we return the max preview
+        return $this->buildCachePath($fileId, $this->maxPreviewWidth, $this->maxPreviewHeight);
+    }
+
+    /**
+     * Get possible bigger thumbnails of the given image with the proper aspect ratio
+     *
+     * @param FileInfo[] $allThumbnails the list of all our cached thumbnails
+     *
+     * @return string[] an array of paths to bigger thumbnails
+     */
+    private function getPossibleThumbnails($allThumbnails) {
+        if ($this->keepAspect) {
+            $wantedAspectRatio = (float)($this->maxPreviewWidth / $this->maxPreviewHeight);
+        } else {
+            $wantedAspectRatio = (float)($this->getMaxX() / $this->getMaxY());
+        }
+
+        //array for usable cached thumbnails
+        $possibleThumbnails = array();
+        foreach ($allThumbnails as $thumbnail) {
+            $name = rtrim($thumbnail['name'], '.png');
+            list($x, $y, $aspectRatio) = $this->getDimensionsFromFilename($name);
+            if (abs($aspectRatio - $wantedAspectRatio) >= 0.000001
+                || $this->unscalable($x, $y)
+            ) {
+                continue;
+            }
+            $possibleThumbnails[$x] = $thumbnail['path'];
+        }
+
+        ksort($possibleThumbnails);
+
+        return $possibleThumbnails;
+    }
+
+    /**
+     * Looks at the preview filename from the cache and extracts the size of the preview
+     *
+     * @param string $name
+     *
+     * @return array<int,int,float>
+     */
+    private function getDimensionsFromFilename($name) {
+        $size = explode('-', $name);
+        $x = (int)$size[0];
+        $y = (int)$size[1];
+        $aspectRatio = (float)($x / $y);
+
+        return array($x, $y, $aspectRatio);
+    }
+
+    /**
+     * @param int $x
+     * @param int $y
+     *
+     * @return bool
+     */
+    private function unscalable($x, $y) {
+
+        $maxX = $this->getMaxX();
+        $maxY = $this->getMaxY();
+        $scalingUp = $this->getScalingUp();
+        $maxScaleFactor = $this->getMaxScaleFactor();
+
+        if ($x < $maxX || $y < $maxY) {
+            if ($scalingUp) {
+                $scaleFactor = $maxX / $x;
+                if ($scaleFactor > $maxScaleFactor) {
+                    return true;
+                }
+            } else {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns a preview of a file
+     *
+     * The cache is searched first and if nothing usable was found then a preview is
+     * generated by one of the providers
+     *
+     * @return \OCP\IImage
+     */
+    public function getPreview() {
+        if (!is_null($this->preview) && $this->preview->valid()) {
+            return $this->preview;
+        }
+
+        $this->preview = null;
+        $fileInfo = $this->getFileInfo();
+        if ($fileInfo === null || $fileInfo === false || !$fileInfo->isReadable()) {
+            return new \OC_Image();
+        }
+
+        $fileId = $fileInfo->getId();
+        $cached = $this->isCached($fileId);
+        if ($cached) {
+            $this->getCachedPreview($fileId, $cached);
+        }
+
+        if (is_null($this->preview)) {
+            $this->generatePreview($fileId);
+        }
+
+        // We still don't have a preview, so we send back an empty object
+        if (is_null($this->preview)) {
+            $this->preview = new \OC_Image();
+        }
+
+        return $this->preview;
+    }
+
+    /**
+     * Sends the preview, including the headers to client which requested it
+     *
+     * @param null|string $mimeTypeForHeaders the media type to use when sending back the reply
+     *
+     * @throws NotFoundException
+     * @throws PreviewNotAvailableException
+     */
+    public function showPreview($mimeTypeForHeaders = null) {
+        // Check if file is valid
+        if ($this->isFileValid() === false) {
+            throw new NotFoundException('File not found.');
+        }
+
+        if (is_null($this->preview)) {
+            $this->getPreview();
+        }
+        if ($this->preview instanceof \OCP\IImage) {
+            if ($this->preview->valid()) {
+                \OCP\Response::enableCaching(3600 * 24); // 24 hours
+            } else {
+                $this->getMimeIcon();
+            }
+            $this->preview->show($mimeTypeForHeaders);
+        }
+    }
+
+    /**
+     * Retrieves the preview from the cache and resizes it if necessary
+     *
+     * @param int $fileId fileId of the original image
+     * @param string $cached the path to the cached preview
+     */
+    private function getCachedPreview($fileId, $cached) {
+        $stream = $this->userView->fopen($cached, 'r');
+        $this->preview = null;
+        if ($stream) {
+            $image = new \OC_Image();
+            $image->loadFromFileHandle($stream);
+
+            $this->preview = $image->valid() ? $image : null;
+
+            if (!is_null($this->preview)) {
+                // Size of the preview we calculated
+                $maxX = $this->previewWidth;
+                $maxY = $this->previewHeight;
+                // Size of the preview we retrieved from the cache
+                $previewX = (int)$this->preview->width();
+                $previewY = (int)$this->preview->height();
+
+                // We don't have an exact match
+                if ($previewX !== $maxX || $previewY !== $maxY) {
+                    $this->resizeAndStore($fileId);
+                }
+            }
+
+            fclose($stream);
+        }
+    }
+
+    /**
+     * Resizes, crops, fixes orientation and stores in the cache
+     *
+     * @param int $fileId fileId of the original image
+     */
+    private function resizeAndStore($fileId) {
+        $image = $this->preview;
+        if (!($image instanceof \OCP\IImage)) {
+            \OCP\Util::writeLog(
+                'core', '$this->preview is not an instance of \OCP\IImage', \OCP\Util::DEBUG
+            );
+
+            return;
+        }
+        $previewWidth = (int)$image->width();
+        $previewHeight = (int)$image->height();
+        $askedWidth = $this->getMaxX();
+        $askedHeight = $this->getMaxY();
+
+        if ($this->mode === self::MODE_COVER) {
+            list($askedWidth, $askedHeight) =
+                $this->applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight);
+        }
+
+        /**
+         * Phase 1: If required, adjust boundaries to keep aspect ratio
+         */
+        if ($this->keepAspect) {
+            list($askedWidth, $askedHeight) =
+                $this->applyAspectRatio($askedWidth, $askedHeight, $previewWidth, $previewHeight);
+        }
+
+        /**
+         * Phase 2: Resizes preview to try and match requirements.
+         * Takes the scaling ratio into consideration
+         */
+        list($newPreviewWidth, $newPreviewHeight) = $this->scale(
+            $image, $askedWidth, $askedHeight, $previewWidth, $previewHeight
+        );
+
+        // The preview has been resized and should now have the asked dimensions
+        if ($newPreviewWidth === $askedWidth && $newPreviewHeight === $askedHeight) {
+            $this->storePreview($fileId, $newPreviewWidth, $newPreviewHeight);
+
+            return;
+        }
+
+        /**
+         * Phase 3: We're still not there yet, so we're clipping and filling
+         * to match the asked dimensions
+         */
+        // It turns out the scaled preview is now too big, so we crop the image
+        if ($newPreviewWidth >= $askedWidth && $newPreviewHeight >= $askedHeight) {
+            $this->crop($image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight);
+            $this->storePreview($fileId, $askedWidth, $askedHeight);
+
+            return;
+        }
+
+        // At least one dimension of the scaled preview is too small,
+        // so we fill the space with a transparent background
+        if (($newPreviewWidth < $askedWidth || $newPreviewHeight < $askedHeight)) {
+            $this->cropAndFill(
+                $image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight
+            );
+            $this->storePreview($fileId, $askedWidth, $askedHeight);
+
+            return;
+        }
+
+        // The preview is smaller, but we can't touch it
+        $this->storePreview($fileId, $newPreviewWidth, $newPreviewHeight);
+    }
+
+    /**
+     * Calculates the new dimensions of the preview
+     *
+     * The new dimensions can be larger or smaller than the ones of the preview we have to resize
+     *
+     * @param \OCP\IImage $image
+     * @param int $askedWidth
+     * @param int $askedHeight
+     * @param int $previewWidth
+     * @param int $previewHeight
+     *
+     * @return int[]
+     */
+    private function scale($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) {
+        $scalingUp = $this->getScalingUp();
+        $maxScaleFactor = $this->getMaxScaleFactor();
+
+        $factorX = $askedWidth / $previewWidth;
+        $factorY = $askedHeight / $previewHeight;
+
+        if ($factorX >= $factorY) {
+            $factor = $factorX;
+        } else {
+            $factor = $factorY;
+        }
+
+        if ($scalingUp === false) {
+            if ($factor > 1) {
+                $factor = 1;
+            }
+        }
+
+        // We cap when upscaling
+        if (!is_null($maxScaleFactor)) {
+            if ($factor > $maxScaleFactor) {
+                \OCP\Util::writeLog(
+                    'core', 'scale factor reduced from ' . $factor . ' to ' . $maxScaleFactor,
+                    \OCP\Util::DEBUG
+                );
+                $factor = $maxScaleFactor;
+            }
+        }
+
+        $newPreviewWidth = round($previewWidth * $factor);
+        $newPreviewHeight = round($previewHeight * $factor);
+
+        $image->preciseResize($newPreviewWidth, $newPreviewHeight);
+        $this->preview = $image;
+
+        return [$newPreviewWidth, $newPreviewHeight];
+    }
+
+    /**
+     * Crops a preview which is larger than the dimensions we've received
+     *
+     * @param \OCP\IImage $image
+     * @param int $askedWidth
+     * @param int $askedHeight
+     * @param int $previewWidth
+     * @param int $previewHeight
+     */
+    private function crop($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight = null) {
+        $cropX = floor(abs($askedWidth - $previewWidth) * 0.5);
+        //don't crop previews on the Y axis, this sucks if it's a document.
+        //$cropY = floor(abs($y - $newPreviewHeight) * 0.5);
+        $cropY = 0;
+        $image->crop($cropX, $cropY, $askedWidth, $askedHeight);
+        $this->preview = $image;
+    }
+
+    /**
+     * Crops an image if it's larger than the dimensions we've received and fills the empty space
+     * with a transparent background
+     *
+     * @param \OCP\IImage $image
+     * @param int $askedWidth
+     * @param int $askedHeight
+     * @param int $previewWidth
+     * @param int $previewHeight
+     */
+    private function cropAndFill($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) {
+        if ($previewWidth > $askedWidth) {
+            $cropX = floor(($previewWidth - $askedWidth) * 0.5);
+            $image->crop($cropX, 0, $askedWidth, $previewHeight);
+            $previewWidth = $askedWidth;
+        }
+
+        if ($previewHeight > $askedHeight) {
+            $cropY = floor(($previewHeight - $askedHeight) * 0.5);
+            $image->crop(0, $cropY, $previewWidth, $askedHeight);
+            $previewHeight = $askedHeight;
+        }
+
+        // Creates a transparent background
+        $backgroundLayer = imagecreatetruecolor($askedWidth, $askedHeight);
+        imagealphablending($backgroundLayer, false);
+        $transparency = imagecolorallocatealpha($backgroundLayer, 0, 0, 0, 127);
+        imagefill($backgroundLayer, 0, 0, $transparency);
+        imagesavealpha($backgroundLayer, true);
+
+        $image = $image->resource();
+
+        $mergeX = floor(abs($askedWidth - $previewWidth) * 0.5);
+        $mergeY = floor(abs($askedHeight - $previewHeight) * 0.5);
+
+        // Pastes the preview on top of the background
+        imagecopy(
+            $backgroundLayer, $image, $mergeX, $mergeY, 0, 0, $previewWidth,
+            $previewHeight
+        );
+
+        $image = new \OC_Image($backgroundLayer);
+
+        $this->preview = $image;
+    }
+
+    /**
+     * Saves a preview in the cache to speed up future calls
+     *
+     * Do not nullify the preview as it might send the whole process in a loop
+     *
+     * @param int $fileId fileId of the original image
+     * @param int $previewWidth
+     * @param int $previewHeight
+     */
+    private function storePreview($fileId, $previewWidth, $previewHeight) {
+        if (empty($previewWidth) || empty($previewHeight)) {
+            \OCP\Util::writeLog(
+                'core', 'Cannot save preview of dimension ' . $previewWidth . 'x' . $previewHeight,
+                \OCP\Util::DEBUG
+            );
+
+        } else {
+            $cachePath = $this->buildCachePath($fileId, $previewWidth, $previewHeight);
+            $this->userView->file_put_contents($cachePath, $this->preview->data());
+        }
+    }
+
+    /**
+     * Returns the path to a preview based on its dimensions and aspect
+     *
+     * @param int $fileId
+     * @param int|null $maxX
+     * @param int|null $maxY
+     *
+     * @return string
+     */
+    private function buildCachePath($fileId, $maxX = null, $maxY = null) {
+        if (is_null($maxX)) {
+            $maxX = $this->getMaxX();
+        }
+        if (is_null($maxY)) {
+            $maxY = $this->getMaxY();
+        }
+
+        $previewPath = $this->getPreviewPath($fileId);
+        $previewPath = $previewPath . strval($maxX) . '-' . strval($maxY);
+        $isMaxPreview =
+            ($maxX === $this->maxPreviewWidth && $maxY === $this->maxPreviewHeight) ? true : false;
+        if ($isMaxPreview) {
+            $previewPath .= '-max';
+        }
+        if ($this->keepAspect && !$isMaxPreview) {
+            $previewPath .= '-with-aspect';
+        }
+        if ($this->mode === self::MODE_COVER) {
+            $previewPath .= '-cover';
+        }
+        $previewPath .= '.png';
+
+        return $previewPath;
+    }
+
+    /**
+     * Returns the path to the folder where the previews are stored, identified by the fileId
+     *
+     * @param int $fileId
+     *
+     * @return string
+     */
+    private function getPreviewPath($fileId) {
+        return $this->getThumbnailsFolder() . '/' . $fileId . '/';
+    }
+
+    /**
+     * Asks the provider to send a preview of the file which respects the maximum dimensions
+     * defined in the configuration and after saving it in the cache, it is then resized to the
+     * asked dimensions
+     *
+     * This is only called once in order to generate a large PNG of dimensions defined in the
+     * configuration file. We'll be able to quickly resize it later on.
+     * We never upscale the original conversion as this will be done later by the resizing
+     * operation
+     *
+     * @param int $fileId fileId of the original image
+     */
+    private function generatePreview($fileId) {
+        $file = $this->getFile();
+        $preview = null;
+
+        $previewProviders = \OC::$server->getPreviewManager()
+            ->getProviders();
+        foreach ($previewProviders as $supportedMimeType => $providers) {
+            if (!preg_match($supportedMimeType, $this->mimeType)) {
+                continue;
+            }
+
+            foreach ($providers as $closure) {
+                $provider = $closure();
+                if (!($provider instanceof \OCP\Preview\IProvider)) {
+                    continue;
+                }
+
+                \OCP\Util::writeLog(
+                    'core', 'Generating preview for "' . $file . '" with "' . get_class($provider)
+                    . '"', \OCP\Util::DEBUG
+                );
+
+                /** @var $provider Provider */
+                $preview = $provider->getThumbnail(
+                    $file, $this->configMaxWidth, $this->configMaxHeight, $scalingUp = false,
+                    $this->fileView
+                );
+
+                if (!($preview instanceof \OCP\IImage)) {
+                    continue;
+                }
+
+                $this->preview = $preview;
+                $previewPath = $this->getPreviewPath($fileId);
+
+                if ($this->userView->is_dir($this->getThumbnailsFolder() . '/') === false) {
+                    $this->userView->mkdir($this->getThumbnailsFolder() . '/');
+                }
+
+                if ($this->userView->is_dir($previewPath) === false) {
+                    $this->userView->mkdir($previewPath);
+                }
+
+                // This stores our large preview so that it can be used in subsequent resizing requests
+                $this->storeMaxPreview($previewPath);
+
+                break 2;
+            }
+        }
+
+        // The providers have been kind enough to give us a preview
+        if ($preview) {
+            $this->resizeAndStore($fileId);
+        }
+    }
+
+    /**
+     * Defines the media icon, for the media type of the original file, as the preview
+     * @throws PreviewNotAvailableException
+     */
+    private function getMimeIcon() {
+        $image = new \OC_Image();
+        $mimeIconWebPath = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($this->mimeType);
+        if (empty(\OC::$WEBROOT)) {
+            $mimeIconServerPath = \OC::$SERVERROOT . $mimeIconWebPath;
+        } else {
+            $mimeIconServerPath = str_replace(\OC::$WEBROOT, \OC::$SERVERROOT, $mimeIconWebPath);
+        }
+        // we can't load SVGs into an image
+        if (substr($mimeIconWebPath, -4) === '.svg') {
+            throw new PreviewNotAvailableException('SVG mimetype cannot be rendered');
+        }
+        $image->loadFromFile($mimeIconServerPath);
+
+        $this->preview = $image;
+    }
+
+    /**
+     * Stores the max preview in the cache
+     *
+     * @param string $previewPath path to the preview
+     */
+    private function storeMaxPreview($previewPath) {
+        $maxPreviewExists = false;
+        $preview = $this->preview;
+
+        $allThumbnails = $this->userView->getDirectoryContent($previewPath);
+        // This is so that the cache doesn't need emptying when upgrading
+        // Can be replaced by an upgrade script...
+        foreach ($allThumbnails as $thumbnail) {
+            $name = rtrim($thumbnail['name'], '.png');
+            if (strpos($name, 'max')) {
+                $maxPreviewExists = true;
+                break;
+            }
+        }
+        // We haven't found the max preview, so we create it
+        if (!$maxPreviewExists) {
+            $previewWidth = $preview->width();
+            $previewHeight = $preview->height();
+            $previewPath = $previewPath . strval($previewWidth) . '-' . strval($previewHeight);
+            $previewPath .= '-max.png';
+            $this->userView->file_put_contents($previewPath, $preview->data());
+            $this->maxPreviewWidth = $previewWidth;
+            $this->maxPreviewHeight = $previewHeight;
+        }
+    }
+
+    /**
+     * Limits a dimension to the maximum dimension provided as argument
+     *
+     * @param int $dim
+     * @param int $maxDim
+     * @param string $dimName
+     *
+     * @return integer
+     */
+    private function limitMaxDim($dim, $maxDim, $dimName) {
+        if (!is_null($maxDim)) {
+            if ($dim > $maxDim) {
+                \OCP\Util::writeLog(
+                    'core', $dimName . ' reduced from ' . $dim . ' to ' . $maxDim, \OCP\Util::DEBUG
+                );
+                $dim = $maxDim;
+            }
+        }
+
+        return $dim;
+    }
+
+    /**
+     * @param array $args
+     */
+    public static function post_write($args) {
+        self::post_delete($args, 'files/');
+    }
+
+    /**
+     * @param array $args
+     */
+    public static function prepare_delete_files($args) {
+        self::prepare_delete($args, 'files/');
+    }
+
+    /**
+     * @param array $args
+     * @param string $prefix
+     */
+    public static function prepare_delete(array $args, $prefix = '') {
+        $path = $args['path'];
+        if (substr($path, 0, 1) === '/') {
+            $path = substr($path, 1);
+        }
+
+        $view = new \OC\Files\View('/' . \OC_User::getUser() . '/' . $prefix);
+
+        $absPath = Files\Filesystem::normalizePath($view->getAbsolutePath($path));
+        $fileInfo = $view->getFileInfo($path);
+        if ($fileInfo === false) {
+            return;
+        }
+        self::addPathToDeleteFileMapper($absPath, $fileInfo);
+        if ($view->is_dir($path)) {
+            $children = self::getAllChildren($view, $path);
+            self::$deleteChildrenMapper[$absPath] = $children;
+        }
+    }
+
+    /**
+     * @param string $absolutePath
+     * @param \OCP\Files\FileInfo $info
+     */
+    private static function addPathToDeleteFileMapper($absolutePath, $info) {
+        self::$deleteFileMapper[$absolutePath] = $info;
+    }
+
+    /**
+     * @param \OC\Files\View $view
+     * @param string $path
+     *
+     * @return array
+     */
+    private static function getAllChildren($view, $path) {
+        $children = $view->getDirectoryContent($path);
+        $childrensFiles = array();
+
+        $fakeRootLength = strlen($view->getRoot());
+
+        for ($i = 0; $i < count($children); $i++) {
+            $child = $children[$i];
+
+            $childsPath = substr($child->getPath(), $fakeRootLength);
+
+            if ($view->is_dir($childsPath)) {
+                $children = array_merge(
+                    $children,
+                    $view->getDirectoryContent($childsPath)
+                );
+            } else {
+                $childrensFiles[] = $child;
+            }
+        }
+
+        return $childrensFiles;
+    }
+
+    /**
+     * @param array $args
+     */
+    public static function post_delete_files($args) {
+        self::post_delete($args, 'files/');
+    }
+
+    /**
+     * @param array $args
+     */
+    public static function post_delete_versions($args) {
+        self::post_delete($args, 'files/');
+    }
+
+    /**
+     * @param array $args
+     * @param string $prefix
+     */
+    public static function post_delete($args, $prefix = '') {
+        $path = Files\Filesystem::normalizePath($args['path']);
+
+        $preview = new Preview(\OC_User::getUser(), $prefix, $path);
+        $preview->deleteAllPreviews();
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -118,8 +118,8 @@ 
 		if ($user === '') {
 			$user = \OC_User::getUser();
 		}
-		$this->fileView = new \OC\Files\View('/' . $user . '/' . $root);
-		$this->userView = new \OC\Files\View('/' . $user);
+		$this->fileView = new \OC\Files\View('/'.$user.'/'.$root);
+		$this->userView = new \OC\Files\View('/'.$user);
 
 		//set config
 		$sysConfig = \OC::$server->getConfig();
@@ -129,8 +129,8 @@ 
 
 		//save parameters
 		$this->setFile($file);
-		$this->setMaxX((int)$maxX);
-		$this->setMaxY((int)$maxY);
+		$this->setMaxX((int) $maxX);
+		$this->setMaxY((int) $maxY);
 		$this->setScalingUp($scalingUp);
 
 		$this->preview = null;
@@ -378,7 +378,7 @@ 
 		}
 
 		if (!$this->getFileInfo() instanceof FileInfo) {
-			\OCP\Util::writeLog('core', 'File:"' . $file . '" not found', \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('core', 'File:"'.$file.'" not found', \OCP\Util::DEBUG);
 
 			return false;
 		}
@@ -565,7 +565,7 @@ 
 			list($newPreviewWidth, $newPreviewHeight) = $this->fixSize($askedWidth, $askedHeight);
 		}
 
-		return [(int)$newPreviewWidth, (int)$newPreviewHeight];
+		return [(int) $newPreviewWidth, (int) $newPreviewHeight];
 	}
 
 	/**
@@ -598,7 +598,7 @@ 
 			$askedWidth = round($askedHeight * $originalRatio);
 		}
 
-		return [(int)$askedWidth, (int)$askedHeight];
+		return [(int) $askedWidth, (int) $askedHeight];
 	}
 
 	/**
@@ -624,7 +624,7 @@ 
 			$askedWidth = round($askedHeight * $originalRatio);
 		}
 
-		return [(int)$askedWidth, (int)$askedHeight];
+		return [(int) $askedWidth, (int) $askedHeight];
 	}
 
 	/**
@@ -642,7 +642,7 @@ 
 			$askedHeight = min($this->configMaxHeight, $askedHeight);
 		}
 
-		return [(int)$askedWidth, (int)$askedHeight];
+		return [(int) $askedWidth, (int) $askedHeight];
 	}
 
 	/**
@@ -682,9 +682,9 @@ 
 	 */
 	private function getPossibleThumbnails($allThumbnails) {
 		if ($this->keepAspect) {
-			$wantedAspectRatio = (float)($this->maxPreviewWidth / $this->maxPreviewHeight);
+			$wantedAspectRatio = (float) ($this->maxPreviewWidth / $this->maxPreviewHeight);
 		} else {
-			$wantedAspectRatio = (float)($this->getMaxX() / $this->getMaxY());
+			$wantedAspectRatio = (float) ($this->getMaxX() / $this->getMaxY());
 		}
 
 		//array for usable cached thumbnails
@@ -714,9 +714,9 @@ 
 	 */
 	private function getDimensionsFromFilename($name) {
 		$size = explode('-', $name);
-		$x = (int)$size[0];
-		$y = (int)$size[1];
-		$aspectRatio = (float)($x / $y);
+		$x = (int) $size[0];
+		$y = (int) $size[1];
+		$aspectRatio = (float) ($x / $y);
 
 		return array($x, $y, $aspectRatio);
 	}
@@ -832,8 +832,8 @@ 
 				$maxX = $this->previewWidth;
 				$maxY = $this->previewHeight;
 				// Size of the preview we retrieved from the cache
-				$previewX = (int)$this->preview->width();
-				$previewY = (int)$this->preview->height();
+				$previewX = (int) $this->preview->width();
+				$previewY = (int) $this->preview->height();
 
 				// We don't have an exact match
 				if ($previewX !== $maxX || $previewY !== $maxY) {
@@ -859,8 +859,8 @@ 
 
 			return;
 		}
-		$previewWidth = (int)$image->width();
-		$previewHeight = (int)$image->height();
+		$previewWidth = (int) $image->width();
+		$previewHeight = (int) $image->height();
 		$askedWidth = $this->getMaxX();
 		$askedHeight = $this->getMaxY();
 
@@ -955,7 +955,7 @@ 
 		if (!is_null($maxScaleFactor)) {
 			if ($factor > $maxScaleFactor) {
 				\OCP\Util::writeLog(
-					'core', 'scale factor reduced from ' . $factor . ' to ' . $maxScaleFactor,
+					'core', 'scale factor reduced from '.$factor.' to '.$maxScaleFactor,
 					\OCP\Util::DEBUG
 				);
 				$factor = $maxScaleFactor;
@@ -1047,7 +1047,7 @@ 
 	private function storePreview($fileId, $previewWidth, $previewHeight) {
 		if (empty($previewWidth) || empty($previewHeight)) {
 			\OCP\Util::writeLog(
-				'core', 'Cannot save preview of dimension ' . $previewWidth . 'x' . $previewHeight,
+				'core', 'Cannot save preview of dimension '.$previewWidth.'x'.$previewHeight,
 				\OCP\Util::DEBUG
 			);
 
@@ -1075,7 +1075,7 @@ 
 		}
 
 		$previewPath = $this->getPreviewPath($fileId);
-		$previewPath = $previewPath . strval($maxX) . '-' . strval($maxY);
+		$previewPath = $previewPath.strval($maxX).'-'.strval($maxY);
 		$isMaxPreview =
 			($maxX === $this->maxPreviewWidth && $maxY === $this->maxPreviewHeight) ? true : false;
 		if ($isMaxPreview) {
@@ -1100,7 +1100,7 @@ 
 	 * @return string
 	 */
 	private function getPreviewPath($fileId) {
-		return $this->getThumbnailsFolder() . '/' . $fileId . '/';
+		return $this->getThumbnailsFolder().'/'.$fileId.'/';
 	}
 
 	/**
@@ -1133,7 +1133,7 @@ 
 				}
 
 				\OCP\Util::writeLog(
-					'core', 'Generating preview for "' . $file . '" with "' . get_class($provider)
+					'core', 'Generating preview for "'.$file.'" with "'.get_class($provider)
 					. '"', \OCP\Util::DEBUG
 				);
 
@@ -1150,8 +1150,8 @@ 
 				$this->preview = $preview;
 				$previewPath = $this->getPreviewPath($fileId);
 
-				if ($this->userView->is_dir($this->getThumbnailsFolder() . '/') === false) {
-					$this->userView->mkdir($this->getThumbnailsFolder() . '/');
+				if ($this->userView->is_dir($this->getThumbnailsFolder().'/') === false) {
+					$this->userView->mkdir($this->getThumbnailsFolder().'/');
 				}
 
 				if ($this->userView->is_dir($previewPath) === false) {
@@ -1179,7 +1179,7 @@ 
 		$image = new \OC_Image();
 		$mimeIconWebPath = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($this->mimeType);
 		if (empty(\OC::$WEBROOT)) {
-			$mimeIconServerPath = \OC::$SERVERROOT . $mimeIconWebPath;
+			$mimeIconServerPath = \OC::$SERVERROOT.$mimeIconWebPath;
 		} else {
 			$mimeIconServerPath = str_replace(\OC::$WEBROOT, \OC::$SERVERROOT, $mimeIconWebPath);
 		}
@@ -1215,7 +1215,7 @@ 
 		if (!$maxPreviewExists) {
 			$previewWidth = $preview->width();
 			$previewHeight = $preview->height();
-			$previewPath = $previewPath . strval($previewWidth) . '-' . strval($previewHeight);
+			$previewPath = $previewPath.strval($previewWidth).'-'.strval($previewHeight);
 			$previewPath .= '-max.png';
 			$this->userView->file_put_contents($previewPath, $preview->data());
 			$this->maxPreviewWidth = $previewWidth;
@@ -1236,7 +1236,7 @@ 
 		if (!is_null($maxDim)) {
 			if ($dim > $maxDim) {
 				\OCP\Util::writeLog(
-					'core', $dimName . ' reduced from ' . $dim . ' to ' . $maxDim, \OCP\Util::DEBUG
+					'core', $dimName.' reduced from '.$dim.' to '.$maxDim, \OCP\Util::DEBUG
 				);
 				$dim = $maxDim;
 			}
@@ -1269,7 +1269,7 @@ 
 			$path = substr($path, 1);
 		}
 
-		$view = new \OC\Files\View('/' . \OC_User::getUser() . '/' . $prefix);
+		$view = new \OC\Files\View('/'.\OC_User::getUser().'/'.$prefix);
 
 		$absPath = Files\Filesystem::normalizePath($view->getAbsolutePath($path));
 		$fileInfo = $view->getFileInfo($path);

lib/private/Repair.php

Doc Comments +1 added lines, -2 removed lines

@@ -139,7 +139,7 @@ 
 	 * Returns expensive repair steps to be run on the
 	 * command line with a special option.
 	 *
-	 * @return IRepairStep[]
+	 * @return OldGroupMembershipShares[]
 	 */
 	public static function getExpensiveRepairSteps() {
 		return [
@@ -216,7 +216,6 @@ 
 	}
 
 	/**
-	 * @param int $max
 	 */
 	public function finishProgress() {
 		// for now just emit as we did in the past

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
-class Repair implements IOutput{
+class Repair implements IOutput {
 	/* @var IRepairStep[] */
 	private $repairSteps;
 	/** @var EventDispatcher */

Indentation +181 added lines, -181 removed lines

@@ -58,185 +58,185 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Repair implements IOutput{
-	/* @var IRepairStep[] */
-	private $repairSteps;
-	/** @var EventDispatcher */
-	private $dispatcher;
-	/** @var string */
-	private $currentStep;
-
-	/**
-	 * Creates a new repair step runner
-	 *
-	 * @param IRepairStep[] $repairSteps array of RepairStep instances
-	 * @param EventDispatcher $dispatcher
-	 */
-	public function __construct($repairSteps = [], EventDispatcher $dispatcher = null) {
-		$this->repairSteps = $repairSteps;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * Run a series of repair steps for common problems
-	 */
-	public function run() {
-		if (count($this->repairSteps) === 0) {
-			$this->emit('\OC\Repair', 'info', array('No repair steps available'));
-			return;
-		}
-		// run each repair step
-		foreach ($this->repairSteps as $step) {
-			$this->currentStep = $step->getName();
-			$this->emit('\OC\Repair', 'step', [$this->currentStep]);
-			$step->run($this);
-		}
-	}
-
-	/**
-	 * Add repair step
-	 *
-	 * @param IRepairStep|string $repairStep repair step
-	 * @throws \Exception
-	 */
-	public function addStep($repairStep) {
-		if (is_string($repairStep)) {
-			try {
-				$s = \OC::$server->query($repairStep);
-			} catch (QueryException $e) {
-				if (class_exists($repairStep)) {
-					$s = new $repairStep();
-				} else {
-					throw new \Exception("Repair step '$repairStep' is unknown");
-				}
-			}
-
-			if ($s instanceof IRepairStep) {
-				$this->repairSteps[] = $s;
-			} else {
-				throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
-			}
-		} else {
-			$this->repairSteps[] = $repairStep;
-		}
-	}
-
-	/**
-	 * Returns the default repair steps to be run on the
-	 * command line or after an upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getRepairSteps() {
-		return [
-			new RepairMimeTypes(\OC::$server->getConfig()),
-			new RepairLegacyStorages(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new AssetCache(),
-			new FillETags(\OC::$server->getDatabaseConnection()),
-			new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
-			new DropOldTables(\OC::$server->getDatabaseConnection()),
-			new DropOldJobs(\OC::$server->getJobList()),
-			new RemoveGetETagEntries(\OC::$server->getDatabaseConnection()),
-			new UpdateOutdatedOcsIds(\OC::$server->getConfig()),
-			new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new SharePropagation(\OC::$server->getConfig()),
-			new RemoveOldShares(\OC::$server->getDatabaseConnection()),
-			new AvatarPermissions(\OC::$server->getDatabaseConnection()),
-			new RemoveRootShares(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager(), \OC::$server->getLazyRootFolder()),
-			new RepairUnmergedShares(
-				\OC::$server->getConfig(),
-				\OC::$server->getDatabaseConnection(),
-				\OC::$server->getUserManager(),
-				\OC::$server->getGroupManager()
-			),
-			new MoveUpdaterStepFile(\OC::$server->getConfig()),
-		];
-	}
-
-	/**
-	 * Returns expensive repair steps to be run on the
-	 * command line with a special option.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getExpensiveRepairSteps() {
-		return [
-			new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
-		];
-	}
-
-	/**
-	 * Returns the repair steps to be run before an
-	 * upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getBeforeUpgradeRepairSteps() {
-		$connection = \OC::$server->getDatabaseConnection();
-		$steps = [
-			new InnoDB(),
-			new Collation(\OC::$server->getConfig(), $connection),
-			new SqliteAutoincrement($connection),
-			new SearchLuceneTables(),
-		];
-
-		//There is no need to delete all previews on every single update
-		//only 7.0.0 through 7.0.2 generated broken previews
-		$currentVersion = \OC::$server->getConfig()->getSystemValue('version');
-		if (version_compare($currentVersion, '7.0.0.0', '>=') &&
-			version_compare($currentVersion, '7.0.3.4', '<=')) {
-			$steps[] = new \OC\Repair\Preview();
-		}
-
-		return $steps;
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments
-	 */
-	public function emit($scope, $method, array $arguments = []) {
-		if (!is_null($this->dispatcher)) {
-			$this->dispatcher->dispatch("$scope::$method",
-				new GenericEvent("$scope::$method", $arguments));
-		}
-	}
-
-	public function info($string) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'info', array($string));
-	}
-
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'warning', [$message]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
-	}
-
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'advance', [$step, $description]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function finishProgress() {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'finishProgress', []);
-	}
+    /* @var IRepairStep[] */
+    private $repairSteps;
+    /** @var EventDispatcher */
+    private $dispatcher;
+    /** @var string */
+    private $currentStep;
+
+    /**
+     * Creates a new repair step runner
+     *
+     * @param IRepairStep[] $repairSteps array of RepairStep instances
+     * @param EventDispatcher $dispatcher
+     */
+    public function __construct($repairSteps = [], EventDispatcher $dispatcher = null) {
+        $this->repairSteps = $repairSteps;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * Run a series of repair steps for common problems
+     */
+    public function run() {
+        if (count($this->repairSteps) === 0) {
+            $this->emit('\OC\Repair', 'info', array('No repair steps available'));
+            return;
+        }
+        // run each repair step
+        foreach ($this->repairSteps as $step) {
+            $this->currentStep = $step->getName();
+            $this->emit('\OC\Repair', 'step', [$this->currentStep]);
+            $step->run($this);
+        }
+    }
+
+    /**
+     * Add repair step
+     *
+     * @param IRepairStep|string $repairStep repair step
+     * @throws \Exception
+     */
+    public function addStep($repairStep) {
+        if (is_string($repairStep)) {
+            try {
+                $s = \OC::$server->query($repairStep);
+            } catch (QueryException $e) {
+                if (class_exists($repairStep)) {
+                    $s = new $repairStep();
+                } else {
+                    throw new \Exception("Repair step '$repairStep' is unknown");
+                }
+            }
+
+            if ($s instanceof IRepairStep) {
+                $this->repairSteps[] = $s;
+            } else {
+                throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
+            }
+        } else {
+            $this->repairSteps[] = $repairStep;
+        }
+    }
+
+    /**
+     * Returns the default repair steps to be run on the
+     * command line or after an upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getRepairSteps() {
+        return [
+            new RepairMimeTypes(\OC::$server->getConfig()),
+            new RepairLegacyStorages(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new AssetCache(),
+            new FillETags(\OC::$server->getDatabaseConnection()),
+            new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
+            new DropOldTables(\OC::$server->getDatabaseConnection()),
+            new DropOldJobs(\OC::$server->getJobList()),
+            new RemoveGetETagEntries(\OC::$server->getDatabaseConnection()),
+            new UpdateOutdatedOcsIds(\OC::$server->getConfig()),
+            new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new SharePropagation(\OC::$server->getConfig()),
+            new RemoveOldShares(\OC::$server->getDatabaseConnection()),
+            new AvatarPermissions(\OC::$server->getDatabaseConnection()),
+            new RemoveRootShares(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager(), \OC::$server->getLazyRootFolder()),
+            new RepairUnmergedShares(
+                \OC::$server->getConfig(),
+                \OC::$server->getDatabaseConnection(),
+                \OC::$server->getUserManager(),
+                \OC::$server->getGroupManager()
+            ),
+            new MoveUpdaterStepFile(\OC::$server->getConfig()),
+        ];
+    }
+
+    /**
+     * Returns expensive repair steps to be run on the
+     * command line with a special option.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getExpensiveRepairSteps() {
+        return [
+            new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
+        ];
+    }
+
+    /**
+     * Returns the repair steps to be run before an
+     * upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getBeforeUpgradeRepairSteps() {
+        $connection = \OC::$server->getDatabaseConnection();
+        $steps = [
+            new InnoDB(),
+            new Collation(\OC::$server->getConfig(), $connection),
+            new SqliteAutoincrement($connection),
+            new SearchLuceneTables(),
+        ];
+
+        //There is no need to delete all previews on every single update
+        //only 7.0.0 through 7.0.2 generated broken previews
+        $currentVersion = \OC::$server->getConfig()->getSystemValue('version');
+        if (version_compare($currentVersion, '7.0.0.0', '>=') &&
+            version_compare($currentVersion, '7.0.3.4', '<=')) {
+            $steps[] = new \OC\Repair\Preview();
+        }
+
+        return $steps;
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments
+     */
+    public function emit($scope, $method, array $arguments = []) {
+        if (!is_null($this->dispatcher)) {
+            $this->dispatcher->dispatch("$scope::$method",
+                new GenericEvent("$scope::$method", $arguments));
+        }
+    }
+
+    public function info($string) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'info', array($string));
+    }
+
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'warning', [$message]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
+    }
+
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'advance', [$step, $description]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function finishProgress() {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'finishProgress', []);
+    }
 }

lib/private/Repair/Collation.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	}
 
 	/**
-	 * @param \Doctrine\DBAL\Connection $connection
+	 * @param \OC\DB\Connection $connection
 	 * @return string[]
 	 */
 	protected function getAllNonUTF8BinTables($connection) {

Indentation +54 added lines, -54 removed lines

@@ -29,65 +29,65 @@
 use OCP\Migration\IRepairStep;
 
 class Collation implements IRepairStep {
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
 
-	/**
-	 * @var \OC\DB\Connection
-	 */
-	protected $connection;
+    /**
+     * @var \OC\DB\Connection
+     */
+    protected $connection;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OC\DB\Connection $connection
-	 */
-	public function __construct($config, $connection) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
+    /**
+     * @param \OCP\IConfig $config
+     * @param \OC\DB\Connection $connection
+     */
+    public function __construct($config, $connection) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
 
-	public function getName() {
-		return 'Repair MySQL collation';
-	}
+    public function getName() {
+        return 'Repair MySQL collation';
+    }
 
-	/**
-	 * Fix mime types
-	 */
-	public function run(IOutput $output) {
-		if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
-			$output->info('Not a mysql database -> nothing to no');
-			return;
-		}
+    /**
+     * Fix mime types
+     */
+    public function run(IOutput $output) {
+        if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
+            $output->info('Not a mysql database -> nothing to no');
+            return;
+        }
 
-		$tables = $this->getAllNonUTF8BinTables($this->connection);
-		foreach ($tables as $table) {
-			$output->info("Change collation for $table ...");
-			$query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;');
-			$query->execute();
-		}
-	}
+        $tables = $this->getAllNonUTF8BinTables($this->connection);
+        foreach ($tables as $table) {
+            $output->info("Change collation for $table ...");
+            $query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;');
+            $query->execute();
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return string[]
-	 */
-	protected function getAllNonUTF8BinTables($connection) {
-		$dbName = $this->config->getSystemValue("dbname");
-		$rows = $connection->fetchAll(
-			"SELECT DISTINCT(TABLE_NAME) AS `table`" .
-			"	FROM INFORMATION_SCHEMA . COLUMNS" .
-			"	WHERE TABLE_SCHEMA = ?" .
-			"	AND (COLLATION_NAME <> 'utf8_bin' OR CHARACTER_SET_NAME <> 'utf8')" .
-			"	AND TABLE_NAME LIKE \"*PREFIX*%\"",
-			array($dbName)
-		);
-		$result = array();
-		foreach ($rows as $row) {
-			$result[] = $row['table'];
-		}
-		return $result;
-	}
+    /**
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return string[]
+     */
+    protected function getAllNonUTF8BinTables($connection) {
+        $dbName = $this->config->getSystemValue("dbname");
+        $rows = $connection->fetchAll(
+            "SELECT DISTINCT(TABLE_NAME) AS `table`" .
+            "	FROM INFORMATION_SCHEMA . COLUMNS" .
+            "	WHERE TABLE_SCHEMA = ?" .
+            "	AND (COLLATION_NAME <> 'utf8_bin' OR CHARACTER_SET_NAME <> 'utf8')" .
+            "	AND TABLE_NAME LIKE \"*PREFIX*%\"",
+            array($dbName)
+        );
+        $result = array();
+        foreach ($rows as $row) {
+            $result[] = $row['table'];
+        }
+        return $result;
+    }
 }
 

Spacing +5 added lines, -5 removed lines

@@ -64,7 +64,7 @@ 
 		$tables = $this->getAllNonUTF8BinTables($this->connection);
 		foreach ($tables as $table) {
 			$output->info("Change collation for $table ...");
-			$query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;');
+			$query = $this->connection->prepare('ALTER TABLE `'.$table.'` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;');
 			$query->execute();
 		}
 	}
@@ -76,10 +76,10 @@ 
 	protected function getAllNonUTF8BinTables($connection) {
 		$dbName = $this->config->getSystemValue("dbname");
 		$rows = $connection->fetchAll(
-			"SELECT DISTINCT(TABLE_NAME) AS `table`" .
-			"	FROM INFORMATION_SCHEMA . COLUMNS" .
-			"	WHERE TABLE_SCHEMA = ?" .
-			"	AND (COLLATION_NAME <> 'utf8_bin' OR CHARACTER_SET_NAME <> 'utf8')" .
+			"SELECT DISTINCT(TABLE_NAME) AS `table`".
+			"	FROM INFORMATION_SCHEMA . COLUMNS".
+			"	WHERE TABLE_SCHEMA = ?".
+			"	AND (COLLATION_NAME <> 'utf8_bin' OR CHARACTER_SET_NAME <> 'utf8')".
 			"	AND TABLE_NAME LIKE \"*PREFIX*%\"",
 			array($dbName)
 		);

lib/private/Repair/InnoDB.php

Doc Comments +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 	}
 
 	/**
-	 * @param \Doctrine\DBAL\Connection $connection
+	 * @param \OCP\IDBConnection $connection
 	 * @return string[]
 	 */
 	private function getAllMyIsamTables($connection) {

Indentation +32 added lines, -32 removed lines

@@ -30,41 +30,41 @@
 
 class InnoDB implements IRepairStep {
 
-	public function getName() {
-		return 'Repair MySQL database engine';
-	}
+    public function getName() {
+        return 'Repair MySQL database engine';
+    }
 
-	/**
-	 * Fix mime types
-	 */
-	public function run(IOutput $output) {
-		$connection = \OC::$server->getDatabaseConnection();
-		if (!$connection->getDatabasePlatform() instanceof MySqlPlatform) {
-			$output->info('Not a mysql database -> nothing to do');
-			return;
-		}
+    /**
+     * Fix mime types
+     */
+    public function run(IOutput $output) {
+        $connection = \OC::$server->getDatabaseConnection();
+        if (!$connection->getDatabasePlatform() instanceof MySqlPlatform) {
+            $output->info('Not a mysql database -> nothing to do');
+            return;
+        }
 
-		$tables = $this->getAllMyIsamTables($connection);
-		if (is_array($tables)) {
-			foreach ($tables as $table) {
-				$connection->exec("ALTER TABLE $table ENGINE=InnoDB;");
-				$output->info("Fixed $table");
-			}
-		}
-	}
+        $tables = $this->getAllMyIsamTables($connection);
+        if (is_array($tables)) {
+            foreach ($tables as $table) {
+                $connection->exec("ALTER TABLE $table ENGINE=InnoDB;");
+                $output->info("Fixed $table");
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return string[]
-	 */
-	private function getAllMyIsamTables($connection) {
-		$dbName = \OC::$server->getConfig()->getSystemValue("dbname");
-		$result = $connection->fetchArray(
-			"SELECT table_name FROM information_schema.tables WHERE table_schema = ? AND engine = 'MyISAM' AND TABLE_NAME LIKE \"*PREFIX*%\"",
-			array($dbName)
-		);
+    /**
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return string[]
+     */
+    private function getAllMyIsamTables($connection) {
+        $dbName = \OC::$server->getConfig()->getSystemValue("dbname");
+        $result = $connection->fetchArray(
+            "SELECT table_name FROM information_schema.tables WHERE table_schema = ? AND engine = 'MyISAM' AND TABLE_NAME LIKE \"*PREFIX*%\"",
+            array($dbName)
+        );
 
-		return $result;
-	}
+        return $result;
+    }
 }
 

lib/private/Security/CredentialsManager.php

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 use OCP\Security\ICrypto;
 use OCP\IDBConnection;
 use OCP\Security\ICredentialsManager;
-use OCP\IConfig;
 
 /**
  * Store and retrieve credentials for external services

Indentation +78 added lines, -78 removed lines

@@ -34,93 +34,93 @@
  */
 class CredentialsManager implements ICredentialsManager {
 
-	const DB_TABLE = 'credentials';
+    const DB_TABLE = 'credentials';
 
-	/** @var ICrypto */
-	protected $crypto;
+    /** @var ICrypto */
+    protected $crypto;
 
-	/** @var IDBConnection */
-	protected $dbConnection;
+    /** @var IDBConnection */
+    protected $dbConnection;
 
-	/**
-	 * @param ICrypto $crypto
-	 * @param IDBConnection $dbConnection
-	 */
-	public function __construct(ICrypto $crypto, IDBConnection $dbConnection) {
-		$this->crypto = $crypto;
-		$this->dbConnection = $dbConnection;
-	}
+    /**
+     * @param ICrypto $crypto
+     * @param IDBConnection $dbConnection
+     */
+    public function __construct(ICrypto $crypto, IDBConnection $dbConnection) {
+        $this->crypto = $crypto;
+        $this->dbConnection = $dbConnection;
+    }
 
-	/**
-	 * Store a set of credentials
-	 *
-	 * @param string|null $userId Null for system-wide credentials
-	 * @param string $identifier
-	 * @param mixed $credentials
-	 */
-	public function store($userId, $identifier, $credentials) {
-		$value = $this->crypto->encrypt(json_encode($credentials));
+    /**
+     * Store a set of credentials
+     *
+     * @param string|null $userId Null for system-wide credentials
+     * @param string $identifier
+     * @param mixed $credentials
+     */
+    public function store($userId, $identifier, $credentials) {
+        $value = $this->crypto->encrypt(json_encode($credentials));
 
-		$this->dbConnection->setValues(self::DB_TABLE, [
-			'user' => $userId,
-			'identifier' => $identifier,
-		], [
-			'credentials' => $value,
-		]);
-	}
+        $this->dbConnection->setValues(self::DB_TABLE, [
+            'user' => $userId,
+            'identifier' => $identifier,
+        ], [
+            'credentials' => $value,
+        ]);
+    }
 
-	/**
-	 * Retrieve a set of credentials
-	 *
-	 * @param string|null $userId Null for system-wide credentials
-	 * @param string $identifier
-	 * @return mixed
-	 */
-	public function retrieve($userId, $identifier) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('credentials')
-			->from(self::DB_TABLE)
-			->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
-			->andWhere($qb->expr()->eq('identifier', $qb->createNamedParameter($identifier)))
-		;
-		$result = $qb->execute()->fetch();
+    /**
+     * Retrieve a set of credentials
+     *
+     * @param string|null $userId Null for system-wide credentials
+     * @param string $identifier
+     * @return mixed
+     */
+    public function retrieve($userId, $identifier) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('credentials')
+            ->from(self::DB_TABLE)
+            ->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
+            ->andWhere($qb->expr()->eq('identifier', $qb->createNamedParameter($identifier)))
+        ;
+        $result = $qb->execute()->fetch();
 
-		if (!$result) {
-			return null;
-		}
-		$value = $result['credentials'];
+        if (!$result) {
+            return null;
+        }
+        $value = $result['credentials'];
 
-		return json_decode($this->crypto->decrypt($value), true);
-	}
+        return json_decode($this->crypto->decrypt($value), true);
+    }
 
-	/**
-	 * Delete a set of credentials
-	 *
-	 * @param string|null $userId Null for system-wide credentials
-	 * @param string $identifier
-	 * @return int rows removed
-	 */
-	public function delete($userId, $identifier) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete(self::DB_TABLE)
-			->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
-			->andWhere($qb->expr()->eq('identifier', $qb->createNamedParameter($identifier)))
-		;
-		return $qb->execute();
-	}
+    /**
+     * Delete a set of credentials
+     *
+     * @param string|null $userId Null for system-wide credentials
+     * @param string $identifier
+     * @return int rows removed
+     */
+    public function delete($userId, $identifier) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->delete(self::DB_TABLE)
+            ->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
+            ->andWhere($qb->expr()->eq('identifier', $qb->createNamedParameter($identifier)))
+        ;
+        return $qb->execute();
+    }
 
-	/**
-	 * Erase all credentials stored for a user
-	 *
-	 * @param string $userId
-	 * @return int rows removed
-	 */
-	public function erase($userId) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete(self::DB_TABLE)
-			->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
-		;
-		return $qb->execute();
-	}
+    /**
+     * Erase all credentials stored for a user
+     *
+     * @param string $userId
+     * @return int rows removed
+     */
+    public function erase($userId) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->delete(self::DB_TABLE)
+            ->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
+        ;
+        return $qb->execute();
+    }
 
 }

lib/private/Server.php

Doc Comments +1 added lines, -1 removed lines

@@ -1074,7 +1074,7 @@
 	 * Get the certificate manager for the user
 	 *
 	 * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
-	 * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
+	 * @return null|CertificateManager | null if $uid is null and no user is logged in
 	 */
 	public function getCertificateManager($userId = '') {
 		if ($userId === '') {

Indentation +1352 added lines, -1352 removed lines

@@ -97,1361 +97,1361 @@
  * TODO: hookup all manager classes
  */
 class Server extends ServerContainer implements IServerContainer {
-	/** @var string */
-	private $webRoot;
-
-	/**
-	 * @param string $webRoot
-	 * @param \OC\Config $config
-	 */
-	public function __construct($webRoot, \OC\Config $config) {
-		parent::__construct();
-		$this->webRoot = $webRoot;
-
-		$this->registerService('ContactsManager', function ($c) {
-			return new ContactsManager();
-		});
-
-		$this->registerService('PreviewManager', function (Server $c) {
-			return new PreviewManager($c->getConfig());
-		});
-
-		$this->registerService('EncryptionManager', function (Server $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->getUserManager(),
-				$c->getGroupManager(),
-				$c->getConfig()
-			);
-			return new Encryption\Manager(
-				$c->getConfig(),
-				$c->getLogger(),
-				$c->getL10N('core'),
-				new View(),
-				$util,
-				new ArrayCache()
-			);
-		});
-
-		$this->registerService('EncryptionFileHelper', function (Server $c) {
-			$util = new Encryption\Util(
-				new View(),
-				$c->getUserManager(),
-				$c->getGroupManager(),
-				$c->getConfig()
-			);
-			return new Encryption\File($util);
-		});
-
-		$this->registerService('EncryptionKeyStorage', function (Server $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->getUserManager(),
-				$c->getGroupManager(),
-				$c->getConfig()
-			);
-
-			return new Encryption\Keys\Storage($view, $util);
-		});
-		$this->registerService('TagMapper', function (Server $c) {
-			return new TagMapper($c->getDatabaseConnection());
-		});
-		$this->registerService('TagManager', function (Server $c) {
-			$tagMapper = $c->query('TagMapper');
-			return new TagManager($tagMapper, $c->getUserSession());
-		});
-		$this->registerService('SystemTagManagerFactory', function (Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('systemtags.managerFactory', '\OC\SystemTag\ManagerFactory');
-			/** @var \OC\SystemTag\ManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			return $factory;
-		});
-		$this->registerService('SystemTagManager', function (Server $c) {
-			return $c->query('SystemTagManagerFactory')->getManager();
-		});
-		$this->registerService('SystemTagObjectMapper', function (Server $c) {
-			return $c->query('SystemTagManagerFactory')->getObjectMapper();
-		});
-		$this->registerService('RootFolder', function () {
-			$manager = \OC\Files\Filesystem::getMountManager(null);
-			$view = new View();
-			$root = new Root($manager, $view, null);
-			$connector = new HookConnector($root, $view);
-			$connector->viewToNode();
-			return $root;
-		});
-		$this->registerService('LazyRootFolder', function(Server $c) {
-			return new LazyRoot(function() use ($c) {
-				return $c->getRootFolder();
-			});
-		});
-		$this->registerService('UserManager', function (Server $c) {
-			$config = $c->getConfig();
-			return new \OC\User\Manager($config);
-		});
-		$this->registerService('GroupManager', function (Server $c) {
-			$groupManager = new \OC\Group\Manager($this->getUserManager());
-			$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
-				\OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));
-			});
-			$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) {
-				\OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID()));
-			});
-			$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
-				\OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID()));
-			});
-			$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
-				\OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID()));
-			});
-			$groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				\OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()));
-			});
-			$groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				\OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
-				//Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
-				\OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
-			});
-			return $groupManager;
-		});
-		$this->registerService('OC\Authentication\Token\DefaultTokenMapper', function (Server $c) {
-			$dbConnection = $c->getDatabaseConnection();
-			return new Authentication\Token\DefaultTokenMapper($dbConnection);
-		});
-		$this->registerService('OC\Authentication\Token\DefaultTokenProvider', function (Server $c) {
-			$mapper = $c->query('OC\Authentication\Token\DefaultTokenMapper');
-			$crypto = $c->getCrypto();
-			$config = $c->getConfig();
-			$logger = $c->getLogger();
-			$timeFactory = new TimeFactory();
-			return new \OC\Authentication\Token\DefaultTokenProvider($mapper, $crypto, $config, $logger, $timeFactory);
-		});
-		$this->registerAlias('OC\Authentication\Token\IProvider', 'OC\Authentication\Token\DefaultTokenProvider');
-		$this->registerService('UserSession', function (Server $c) {
-			$manager = $c->getUserManager();
-			$session = new \OC\Session\Memory('');
-			$timeFactory = new TimeFactory();
-			// Token providers might require a working database. This code
-			// might however be called when ownCloud is not yet setup.
-			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
-				$defaultTokenProvider = $c->query('OC\Authentication\Token\IProvider');
-			} else {
-				$defaultTokenProvider = null;
-			}
-
-			$userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig());
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
-			});
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
-			});
-			$userSession->listen('\OC\User', 'preDelete', function ($user) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
-			});
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
-			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
-			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
-			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
-			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
-			});
-			$userSession->listen('\OC\User', 'logout', function () {
-				\OC_Hook::emit('OC_User', 'logout', array());
-			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value));
-			});
-			return $userSession;
-		});
-
-		$this->registerService('\OC\Authentication\TwoFactorAuth\Manager', function (Server $c) {
-			return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig());
-		});
-
-		$this->registerService('NavigationManager', function ($c) {
-			return new \OC\NavigationManager();
-		});
-		$this->registerService('AllConfig', function (Server $c) {
-			return new \OC\AllConfig(
-				$c->getSystemConfig()
-			);
-		});
-		$this->registerService('SystemConfig', function ($c) use ($config) {
-			return new \OC\SystemConfig($config);
-		});
-		$this->registerService('AppConfig', function (Server $c) {
-			return new \OC\AppConfig($c->getDatabaseConnection());
-		});
-		$this->registerService('L10NFactory', function (Server $c) {
-			return new \OC\L10N\Factory(
-				$c->getConfig(),
-				$c->getRequest(),
-				$c->getUserSession(),
-				\OC::$SERVERROOT
-			);
-		});
-		$this->registerService('URLGenerator', function (Server $c) {
-			$config = $c->getConfig();
-			$cacheFactory = $c->getMemCacheFactory();
-			return new \OC\URLGenerator(
-				$config,
-				$cacheFactory
-			);
-		});
-		$this->registerService('AppHelper', function ($c) {
-			return new \OC\AppHelper();
-		});
-		$this->registerService('UserCache', function ($c) {
-			return new Cache\File();
-		});
-		$this->registerService('MemCacheFactory', function (Server $c) {
-			$config = $c->getConfig();
-
-			if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				$v = \OC_App::getAppVersions();
-				$v['core'] = md5(file_get_contents(\OC::$SERVERROOT . '/version.php'));
-				$version = implode(',', $v);
-				$instanceId = \OC_Util::getInstanceId();
-				$path = \OC::$SERVERROOT;
-				$prefix = md5($instanceId . '-' . $version . '-' . $path);
-				return new \OC\Memcache\Factory($prefix, $c->getLogger(),
-					$config->getSystemValue('memcache.local', null),
-					$config->getSystemValue('memcache.distributed', null),
-					$config->getSystemValue('memcache.locking', null)
-				);
-			}
-
-			return new \OC\Memcache\Factory('', $c->getLogger(),
-				'\\OC\\Memcache\\ArrayCache',
-				'\\OC\\Memcache\\ArrayCache',
-				'\\OC\\Memcache\\ArrayCache'
-			);
-		});
-		$this->registerService('RedisFactory', function (Server $c) {
-			$systemConfig = $c->getSystemConfig();
-			return new RedisFactory($systemConfig);
-		});
-		$this->registerService('ActivityManager', function (Server $c) {
-			return new \OC\Activity\Manager(
-				$c->getRequest(),
-				$c->getUserSession(),
-				$c->getConfig()
-			);
-		});
-		$this->registerService('AvatarManager', function (Server $c) {
-			return new AvatarManager(
-				$c->getUserManager(),
-				$c->getLazyRootFolder(),
-				$c->getL10N('lib'),
-				$c->getLogger()
-			);
-		});
-		$this->registerService('Logger', function (Server $c) {
-			$logClass = $c->query('AllConfig')->getSystemValue('log_type', 'owncloud');
-			$logger = 'OC\\Log\\' . ucfirst($logClass);
-			call_user_func(array($logger, 'init'));
-
-			return new Log($logger);
-		});
-		$this->registerService('JobList', function (Server $c) {
-			$config = $c->getConfig();
-			return new \OC\BackgroundJob\JobList(
-				$c->getDatabaseConnection(),
-				$config,
-				new TimeFactory()
-			);
-		});
-		$this->registerService('Router', function (Server $c) {
-			$cacheFactory = $c->getMemCacheFactory();
-			$logger = $c->getLogger();
-			if ($cacheFactory->isAvailable()) {
-				$router = new \OC\Route\CachingRouter($cacheFactory->create('route'), $logger);
-			} else {
-				$router = new \OC\Route\Router($logger);
-			}
-			return $router;
-		});
-		$this->registerService('Search', function ($c) {
-			return new Search();
-		});
-		$this->registerService('SecureRandom', function ($c) {
-			return new SecureRandom();
-		});
-		$this->registerService('Crypto', function (Server $c) {
-			return new Crypto($c->getConfig(), $c->getSecureRandom());
-		});
-		$this->registerService('Hasher', function (Server $c) {
-			return new Hasher($c->getConfig());
-		});
-		$this->registerService('CredentialsManager', function (Server $c) {
-			return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
-		});
-		$this->registerService('DatabaseConnection', function (Server $c) {
-			$factory = new \OC\DB\ConnectionFactory();
-			$systemConfig = $c->getSystemConfig();
-			$type = $systemConfig->getValue('dbtype', 'sqlite');
-			if (!$factory->isValidType($type)) {
-				throw new \OC\DatabaseException('Invalid database type');
-			}
-			$connectionParams = $factory->createConnectionParams($systemConfig);
-			$connection = $factory->getConnection($type, $connectionParams);
-			$connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
-			return $connection;
-		});
-		$this->registerService('Db', function (Server $c) {
-			return new Db($c->getDatabaseConnection());
-		});
-		$this->registerService('HTTPHelper', function (Server $c) {
-			$config = $c->getConfig();
-			return new HTTPHelper(
-				$config,
-				$c->getHTTPClientService()
-			);
-		});
-		$this->registerService('HttpClientService', function (Server $c) {
-			$user = \OC_User::getUser();
-			$uid = $user ? $user : null;
-			return new ClientService(
-				$c->getConfig(),
-				new \OC\Security\CertificateManager($uid, new View(), $c->getConfig())
-			);
-		});
-		$this->registerService('EventLogger', function (Server $c) {
-			if ($c->getSystemConfig()->getValue('debug', false)) {
-				return new EventLogger();
-			} else {
-				return new NullEventLogger();
-			}
-		});
-		$this->registerService('QueryLogger', function (Server $c) {
-			if ($c->getSystemConfig()->getValue('debug', false)) {
-				return new QueryLogger();
-			} else {
-				return new NullQueryLogger();
-			}
-		});
-		$this->registerService('TempManager', function (Server $c) {
-			return new TempManager(
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-		$this->registerService('AppManager', function (Server $c) {
-			return new \OC\App\AppManager(
-				$c->getUserSession(),
-				$c->getAppConfig(),
-				$c->getGroupManager(),
-				$c->getMemCacheFactory(),
-				$c->getEventDispatcher()
-			);
-		});
-		$this->registerService('DateTimeZone', function (Server $c) {
-			return new DateTimeZone(
-				$c->getConfig(),
-				$c->getSession()
-			);
-		});
-		$this->registerService('DateTimeFormatter', function (Server $c) {
-			$language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
-
-			return new DateTimeFormatter(
-				$c->getDateTimeZone()->getTimeZone(),
-				$c->getL10N('lib', $language)
-			);
-		});
-		$this->registerService('UserMountCache', function (Server $c) {
-			$mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
-			$listener = new UserMountCacheListener($mountCache);
-			$listener->listen($c->getUserManager());
-			return $mountCache;
-		});
-		$this->registerService('MountConfigManager', function (Server $c) {
-			$loader = \OC\Files\Filesystem::getLoader();
-			$mountCache = $c->query('UserMountCache');
-			$manager =  new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
-
-			// builtin providers
-
-			$config = $c->getConfig();
-			$manager->registerProvider(new CacheMountProvider($config));
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($config));
-
-			return $manager;
-		});
-		$this->registerService('IniWrapper', function ($c) {
-			return new IniGetWrapper();
-		});
-		$this->registerService('AsyncCommandBus', function (Server $c) {
-			$jobList = $c->getJobList();
-			return new AsyncBus($jobList);
-		});
-		$this->registerService('TrustedDomainHelper', function ($c) {
-			return new TrustedDomainHelper($this->getConfig());
-		});
-		$this->registerService('Throttler', function(Server $c) {
-			return new Throttler(
-				$c->getDatabaseConnection(),
-				new TimeFactory(),
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-		$this->registerService('IntegrityCodeChecker', function (Server $c) {
-			// IConfig and IAppManager requires a working database. This code
-			// might however be called when ownCloud is not yet setup.
-			if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
-				$config = $c->getConfig();
-				$appManager = $c->getAppManager();
-			} else {
-				$config = null;
-				$appManager = null;
-			}
-
-			return new Checker(
-					new EnvironmentHelper(),
-					new FileAccessHelper(),
-					new AppLocator(),
-					$config,
-					$c->getMemCacheFactory(),
-					$appManager,
-					$c->getTempManager()
-			);
-		});
-		$this->registerService('Request', function ($c) {
-			if (isset($this['urlParams'])) {
-				$urlParams = $this['urlParams'];
-			} else {
-				$urlParams = [];
-			}
-
-			if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
-				&& in_array('fakeinput', stream_get_wrappers())
-			) {
-				$stream = 'fakeinput://data';
-			} else {
-				$stream = 'php://input';
-			}
-
-			return new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: null,
-					'urlParams' => $urlParams,
-				],
-				$this->getSecureRandom(),
-				$this->getConfig(),
-				$this->getCsrfTokenManager(),
-				$stream
-			);
-		});
-		$this->registerService('Mailer', function (Server $c) {
-			return new Mailer(
-				$c->getConfig(),
-				$c->getLogger(),
-				$c->getThemingDefaults()
-			);
-		});
-		$this->registerService('OcsClient', function (Server $c) {
-			return new OCSClient(
-				$this->getHTTPClientService(),
-				$this->getConfig(),
-				$this->getLogger()
-			);
-		});
-		$this->registerService('LDAPProvider', function(Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if(is_null($factoryClass)) {
-				throw new \Exception('ldapProviderFactory not set');
-			}
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
-			$factory = new $factoryClass($this);
-			return $factory->getLDAPProvider();
-		});
-		$this->registerService('LockingProvider', function (Server $c) {
-			$ini = $c->getIniWrapper();
-			$config = $c->getConfig();
-			$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
-			if ($config->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				/** @var \OC\Memcache\Factory $memcacheFactory */
-				$memcacheFactory = $c->getMemCacheFactory();
-				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					return new MemcacheLockingProvider($memcache, $ttl);
-				}
-				return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory(), $ttl);
-			}
-			return new NoopLockingProvider();
-		});
-		$this->registerService('MountManager', function () {
-			return new \OC\Files\Mount\Manager();
-		});
-		$this->registerService('MimeTypeDetector', function (Server $c) {
-			return new \OC\Files\Type\Detection(
-				$c->getURLGenerator(),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-		$this->registerService('MimeTypeLoader', function (Server $c) {
-			return new \OC\Files\Type\Loader(
-				$c->getDatabaseConnection()
-			);
-		});
-		$this->registerService('NotificationManager', function () {
-			return new Manager();
-		});
-		$this->registerService('CapabilitiesManager', function (Server $c) {
-			$manager = new \OC\CapabilitiesManager();
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->getConfig());
-			});
-			return $manager;
-		});
-		$this->registerService('CommentsManager', function(Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('comments.managerFactory', '\OC\Comments\ManagerFactory');
-			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			return $factory->getManager();
-		});
-		$this->registerService('ThemingDefaults', function(Server $c) {
-			/*
+    /** @var string */
+    private $webRoot;
+
+    /**
+     * @param string $webRoot
+     * @param \OC\Config $config
+     */
+    public function __construct($webRoot, \OC\Config $config) {
+        parent::__construct();
+        $this->webRoot = $webRoot;
+
+        $this->registerService('ContactsManager', function ($c) {
+            return new ContactsManager();
+        });
+
+        $this->registerService('PreviewManager', function (Server $c) {
+            return new PreviewManager($c->getConfig());
+        });
+
+        $this->registerService('EncryptionManager', function (Server $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->getUserManager(),
+                $c->getGroupManager(),
+                $c->getConfig()
+            );
+            return new Encryption\Manager(
+                $c->getConfig(),
+                $c->getLogger(),
+                $c->getL10N('core'),
+                new View(),
+                $util,
+                new ArrayCache()
+            );
+        });
+
+        $this->registerService('EncryptionFileHelper', function (Server $c) {
+            $util = new Encryption\Util(
+                new View(),
+                $c->getUserManager(),
+                $c->getGroupManager(),
+                $c->getConfig()
+            );
+            return new Encryption\File($util);
+        });
+
+        $this->registerService('EncryptionKeyStorage', function (Server $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->getUserManager(),
+                $c->getGroupManager(),
+                $c->getConfig()
+            );
+
+            return new Encryption\Keys\Storage($view, $util);
+        });
+        $this->registerService('TagMapper', function (Server $c) {
+            return new TagMapper($c->getDatabaseConnection());
+        });
+        $this->registerService('TagManager', function (Server $c) {
+            $tagMapper = $c->query('TagMapper');
+            return new TagManager($tagMapper, $c->getUserSession());
+        });
+        $this->registerService('SystemTagManagerFactory', function (Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('systemtags.managerFactory', '\OC\SystemTag\ManagerFactory');
+            /** @var \OC\SystemTag\ManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            return $factory;
+        });
+        $this->registerService('SystemTagManager', function (Server $c) {
+            return $c->query('SystemTagManagerFactory')->getManager();
+        });
+        $this->registerService('SystemTagObjectMapper', function (Server $c) {
+            return $c->query('SystemTagManagerFactory')->getObjectMapper();
+        });
+        $this->registerService('RootFolder', function () {
+            $manager = \OC\Files\Filesystem::getMountManager(null);
+            $view = new View();
+            $root = new Root($manager, $view, null);
+            $connector = new HookConnector($root, $view);
+            $connector->viewToNode();
+            return $root;
+        });
+        $this->registerService('LazyRootFolder', function(Server $c) {
+            return new LazyRoot(function() use ($c) {
+                return $c->getRootFolder();
+            });
+        });
+        $this->registerService('UserManager', function (Server $c) {
+            $config = $c->getConfig();
+            return new \OC\User\Manager($config);
+        });
+        $this->registerService('GroupManager', function (Server $c) {
+            $groupManager = new \OC\Group\Manager($this->getUserManager());
+            $groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
+                \OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));
+            });
+            $groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) {
+                \OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID()));
+            });
+            $groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
+                \OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID()));
+            });
+            $groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
+                \OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID()));
+            });
+            $groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                \OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()));
+            });
+            $groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                \OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
+                //Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
+                \OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
+            });
+            return $groupManager;
+        });
+        $this->registerService('OC\Authentication\Token\DefaultTokenMapper', function (Server $c) {
+            $dbConnection = $c->getDatabaseConnection();
+            return new Authentication\Token\DefaultTokenMapper($dbConnection);
+        });
+        $this->registerService('OC\Authentication\Token\DefaultTokenProvider', function (Server $c) {
+            $mapper = $c->query('OC\Authentication\Token\DefaultTokenMapper');
+            $crypto = $c->getCrypto();
+            $config = $c->getConfig();
+            $logger = $c->getLogger();
+            $timeFactory = new TimeFactory();
+            return new \OC\Authentication\Token\DefaultTokenProvider($mapper, $crypto, $config, $logger, $timeFactory);
+        });
+        $this->registerAlias('OC\Authentication\Token\IProvider', 'OC\Authentication\Token\DefaultTokenProvider');
+        $this->registerService('UserSession', function (Server $c) {
+            $manager = $c->getUserManager();
+            $session = new \OC\Session\Memory('');
+            $timeFactory = new TimeFactory();
+            // Token providers might require a working database. This code
+            // might however be called when ownCloud is not yet setup.
+            if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
+                $defaultTokenProvider = $c->query('OC\Authentication\Token\IProvider');
+            } else {
+                $defaultTokenProvider = null;
+            }
+
+            $userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig());
+            $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
+            });
+            $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
+            });
+            $userSession->listen('\OC\User', 'preDelete', function ($user) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
+            });
+            $userSession->listen('\OC\User', 'postDelete', function ($user) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
+            });
+            $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
+            });
+            $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
+            });
+            $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
+            });
+            $userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
+            });
+            $userSession->listen('\OC\User', 'logout', function () {
+                \OC_Hook::emit('OC_User', 'logout', array());
+            });
+            $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value));
+            });
+            return $userSession;
+        });
+
+        $this->registerService('\OC\Authentication\TwoFactorAuth\Manager', function (Server $c) {
+            return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig());
+        });
+
+        $this->registerService('NavigationManager', function ($c) {
+            return new \OC\NavigationManager();
+        });
+        $this->registerService('AllConfig', function (Server $c) {
+            return new \OC\AllConfig(
+                $c->getSystemConfig()
+            );
+        });
+        $this->registerService('SystemConfig', function ($c) use ($config) {
+            return new \OC\SystemConfig($config);
+        });
+        $this->registerService('AppConfig', function (Server $c) {
+            return new \OC\AppConfig($c->getDatabaseConnection());
+        });
+        $this->registerService('L10NFactory', function (Server $c) {
+            return new \OC\L10N\Factory(
+                $c->getConfig(),
+                $c->getRequest(),
+                $c->getUserSession(),
+                \OC::$SERVERROOT
+            );
+        });
+        $this->registerService('URLGenerator', function (Server $c) {
+            $config = $c->getConfig();
+            $cacheFactory = $c->getMemCacheFactory();
+            return new \OC\URLGenerator(
+                $config,
+                $cacheFactory
+            );
+        });
+        $this->registerService('AppHelper', function ($c) {
+            return new \OC\AppHelper();
+        });
+        $this->registerService('UserCache', function ($c) {
+            return new Cache\File();
+        });
+        $this->registerService('MemCacheFactory', function (Server $c) {
+            $config = $c->getConfig();
+
+            if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                $v = \OC_App::getAppVersions();
+                $v['core'] = md5(file_get_contents(\OC::$SERVERROOT . '/version.php'));
+                $version = implode(',', $v);
+                $instanceId = \OC_Util::getInstanceId();
+                $path = \OC::$SERVERROOT;
+                $prefix = md5($instanceId . '-' . $version . '-' . $path);
+                return new \OC\Memcache\Factory($prefix, $c->getLogger(),
+                    $config->getSystemValue('memcache.local', null),
+                    $config->getSystemValue('memcache.distributed', null),
+                    $config->getSystemValue('memcache.locking', null)
+                );
+            }
+
+            return new \OC\Memcache\Factory('', $c->getLogger(),
+                '\\OC\\Memcache\\ArrayCache',
+                '\\OC\\Memcache\\ArrayCache',
+                '\\OC\\Memcache\\ArrayCache'
+            );
+        });
+        $this->registerService('RedisFactory', function (Server $c) {
+            $systemConfig = $c->getSystemConfig();
+            return new RedisFactory($systemConfig);
+        });
+        $this->registerService('ActivityManager', function (Server $c) {
+            return new \OC\Activity\Manager(
+                $c->getRequest(),
+                $c->getUserSession(),
+                $c->getConfig()
+            );
+        });
+        $this->registerService('AvatarManager', function (Server $c) {
+            return new AvatarManager(
+                $c->getUserManager(),
+                $c->getLazyRootFolder(),
+                $c->getL10N('lib'),
+                $c->getLogger()
+            );
+        });
+        $this->registerService('Logger', function (Server $c) {
+            $logClass = $c->query('AllConfig')->getSystemValue('log_type', 'owncloud');
+            $logger = 'OC\\Log\\' . ucfirst($logClass);
+            call_user_func(array($logger, 'init'));
+
+            return new Log($logger);
+        });
+        $this->registerService('JobList', function (Server $c) {
+            $config = $c->getConfig();
+            return new \OC\BackgroundJob\JobList(
+                $c->getDatabaseConnection(),
+                $config,
+                new TimeFactory()
+            );
+        });
+        $this->registerService('Router', function (Server $c) {
+            $cacheFactory = $c->getMemCacheFactory();
+            $logger = $c->getLogger();
+            if ($cacheFactory->isAvailable()) {
+                $router = new \OC\Route\CachingRouter($cacheFactory->create('route'), $logger);
+            } else {
+                $router = new \OC\Route\Router($logger);
+            }
+            return $router;
+        });
+        $this->registerService('Search', function ($c) {
+            return new Search();
+        });
+        $this->registerService('SecureRandom', function ($c) {
+            return new SecureRandom();
+        });
+        $this->registerService('Crypto', function (Server $c) {
+            return new Crypto($c->getConfig(), $c->getSecureRandom());
+        });
+        $this->registerService('Hasher', function (Server $c) {
+            return new Hasher($c->getConfig());
+        });
+        $this->registerService('CredentialsManager', function (Server $c) {
+            return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
+        });
+        $this->registerService('DatabaseConnection', function (Server $c) {
+            $factory = new \OC\DB\ConnectionFactory();
+            $systemConfig = $c->getSystemConfig();
+            $type = $systemConfig->getValue('dbtype', 'sqlite');
+            if (!$factory->isValidType($type)) {
+                throw new \OC\DatabaseException('Invalid database type');
+            }
+            $connectionParams = $factory->createConnectionParams($systemConfig);
+            $connection = $factory->getConnection($type, $connectionParams);
+            $connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
+            return $connection;
+        });
+        $this->registerService('Db', function (Server $c) {
+            return new Db($c->getDatabaseConnection());
+        });
+        $this->registerService('HTTPHelper', function (Server $c) {
+            $config = $c->getConfig();
+            return new HTTPHelper(
+                $config,
+                $c->getHTTPClientService()
+            );
+        });
+        $this->registerService('HttpClientService', function (Server $c) {
+            $user = \OC_User::getUser();
+            $uid = $user ? $user : null;
+            return new ClientService(
+                $c->getConfig(),
+                new \OC\Security\CertificateManager($uid, new View(), $c->getConfig())
+            );
+        });
+        $this->registerService('EventLogger', function (Server $c) {
+            if ($c->getSystemConfig()->getValue('debug', false)) {
+                return new EventLogger();
+            } else {
+                return new NullEventLogger();
+            }
+        });
+        $this->registerService('QueryLogger', function (Server $c) {
+            if ($c->getSystemConfig()->getValue('debug', false)) {
+                return new QueryLogger();
+            } else {
+                return new NullQueryLogger();
+            }
+        });
+        $this->registerService('TempManager', function (Server $c) {
+            return new TempManager(
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+        $this->registerService('AppManager', function (Server $c) {
+            return new \OC\App\AppManager(
+                $c->getUserSession(),
+                $c->getAppConfig(),
+                $c->getGroupManager(),
+                $c->getMemCacheFactory(),
+                $c->getEventDispatcher()
+            );
+        });
+        $this->registerService('DateTimeZone', function (Server $c) {
+            return new DateTimeZone(
+                $c->getConfig(),
+                $c->getSession()
+            );
+        });
+        $this->registerService('DateTimeFormatter', function (Server $c) {
+            $language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
+
+            return new DateTimeFormatter(
+                $c->getDateTimeZone()->getTimeZone(),
+                $c->getL10N('lib', $language)
+            );
+        });
+        $this->registerService('UserMountCache', function (Server $c) {
+            $mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
+            $listener = new UserMountCacheListener($mountCache);
+            $listener->listen($c->getUserManager());
+            return $mountCache;
+        });
+        $this->registerService('MountConfigManager', function (Server $c) {
+            $loader = \OC\Files\Filesystem::getLoader();
+            $mountCache = $c->query('UserMountCache');
+            $manager =  new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
+
+            // builtin providers
+
+            $config = $c->getConfig();
+            $manager->registerProvider(new CacheMountProvider($config));
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($config));
+
+            return $manager;
+        });
+        $this->registerService('IniWrapper', function ($c) {
+            return new IniGetWrapper();
+        });
+        $this->registerService('AsyncCommandBus', function (Server $c) {
+            $jobList = $c->getJobList();
+            return new AsyncBus($jobList);
+        });
+        $this->registerService('TrustedDomainHelper', function ($c) {
+            return new TrustedDomainHelper($this->getConfig());
+        });
+        $this->registerService('Throttler', function(Server $c) {
+            return new Throttler(
+                $c->getDatabaseConnection(),
+                new TimeFactory(),
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+        $this->registerService('IntegrityCodeChecker', function (Server $c) {
+            // IConfig and IAppManager requires a working database. This code
+            // might however be called when ownCloud is not yet setup.
+            if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
+                $config = $c->getConfig();
+                $appManager = $c->getAppManager();
+            } else {
+                $config = null;
+                $appManager = null;
+            }
+
+            return new Checker(
+                    new EnvironmentHelper(),
+                    new FileAccessHelper(),
+                    new AppLocator(),
+                    $config,
+                    $c->getMemCacheFactory(),
+                    $appManager,
+                    $c->getTempManager()
+            );
+        });
+        $this->registerService('Request', function ($c) {
+            if (isset($this['urlParams'])) {
+                $urlParams = $this['urlParams'];
+            } else {
+                $urlParams = [];
+            }
+
+            if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
+                && in_array('fakeinput', stream_get_wrappers())
+            ) {
+                $stream = 'fakeinput://data';
+            } else {
+                $stream = 'php://input';
+            }
+
+            return new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : null,
+                    'urlParams' => $urlParams,
+                ],
+                $this->getSecureRandom(),
+                $this->getConfig(),
+                $this->getCsrfTokenManager(),
+                $stream
+            );
+        });
+        $this->registerService('Mailer', function (Server $c) {
+            return new Mailer(
+                $c->getConfig(),
+                $c->getLogger(),
+                $c->getThemingDefaults()
+            );
+        });
+        $this->registerService('OcsClient', function (Server $c) {
+            return new OCSClient(
+                $this->getHTTPClientService(),
+                $this->getConfig(),
+                $this->getLogger()
+            );
+        });
+        $this->registerService('LDAPProvider', function(Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
+            if(is_null($factoryClass)) {
+                throw new \Exception('ldapProviderFactory not set');
+            }
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
+            $factory = new $factoryClass($this);
+            return $factory->getLDAPProvider();
+        });
+        $this->registerService('LockingProvider', function (Server $c) {
+            $ini = $c->getIniWrapper();
+            $config = $c->getConfig();
+            $ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
+            if ($config->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                /** @var \OC\Memcache\Factory $memcacheFactory */
+                $memcacheFactory = $c->getMemCacheFactory();
+                $memcache = $memcacheFactory->createLocking('lock');
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
+                    return new MemcacheLockingProvider($memcache, $ttl);
+                }
+                return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory(), $ttl);
+            }
+            return new NoopLockingProvider();
+        });
+        $this->registerService('MountManager', function () {
+            return new \OC\Files\Mount\Manager();
+        });
+        $this->registerService('MimeTypeDetector', function (Server $c) {
+            return new \OC\Files\Type\Detection(
+                $c->getURLGenerator(),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+        $this->registerService('MimeTypeLoader', function (Server $c) {
+            return new \OC\Files\Type\Loader(
+                $c->getDatabaseConnection()
+            );
+        });
+        $this->registerService('NotificationManager', function () {
+            return new Manager();
+        });
+        $this->registerService('CapabilitiesManager', function (Server $c) {
+            $manager = new \OC\CapabilitiesManager();
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->getConfig());
+            });
+            return $manager;
+        });
+        $this->registerService('CommentsManager', function(Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('comments.managerFactory', '\OC\Comments\ManagerFactory');
+            /** @var \OCP\Comments\ICommentsManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            return $factory->getManager();
+        });
+        $this->registerService('ThemingDefaults', function(Server $c) {
+            /*
 			 * Dark magic for autoloader.
 			 * If we do a class_exists it will try to load the class which will
 			 * make composer cache the result. Resulting in errors when enabling
 			 * the theming app.
 			 */
-			$prefixes = \OC::$composerAutoloader->getPrefixesPsr4();
-			if (isset($prefixes['OCA\\Theming\\'])) {
-				$classExists = true;
-			} else {
-				$classExists = false;
-			}
-
-			if ($classExists && $this->getConfig()->getSystemValue('installed', false) && $this->getAppManager()->isInstalled('theming')) {
-				return new ThemingDefaults(
-					$this->getConfig(),
-					$this->getL10N('theming'),
-					$this->getURLGenerator(),
-					new \OC_Defaults()
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService('EventDispatcher', function () {
-			return new EventDispatcher();
-		});
-		$this->registerService('CryptoWrapper', function (Server $c) {
-			// FIXME: Instantiiated here due to cyclic dependency
-			$request = new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: null,
-				],
-				$c->getSecureRandom(),
-				$c->getConfig()
-			);
-
-			return new CryptoWrapper(
-				$c->getConfig(),
-				$c->getCrypto(),
-				$c->getSecureRandom(),
-				$request
-			);
-		});
-		$this->registerService('CsrfTokenManager', function (Server $c) {
-			$tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
-			$sessionStorage = new SessionStorage($c->getSession());
-
-			return new CsrfTokenManager(
-				$tokenGenerator,
-				$sessionStorage
-			);
-		});
-		$this->registerService('ContentSecurityPolicyManager', function (Server $c) {
-			return new ContentSecurityPolicyManager();
-		});
-		$this->registerService('ShareManager', function(Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', '\OC\Share20\ProviderFactory');
-			/** @var \OCP\Share\IProviderFactory $factory */
-			$factory = new $factoryClass($this);
-
-			$manager = new \OC\Share20\Manager(
-				$c->getLogger(),
-				$c->getConfig(),
-				$c->getSecureRandom(),
-				$c->getHasher(),
-				$c->getMountManager(),
-				$c->getGroupManager(),
-				$c->getL10N('core'),
-				$factory,
-				$c->getUserManager(),
-				$c->getLazyRootFolder(),
-				$c->getEventDispatcher()
-			);
-
-			return $manager;
-		});
-		$this->registerService('SettingsManager', function(Server $c) {
-			$manager = new \OC\Settings\Manager(
-				$c->getLogger(),
-				$c->getDatabaseConnection(),
-				$c->getL10N('lib'),
-				$c->getConfig(),
-				$c->getEncryptionManager(),
-				$c->getUserManager(),
-				$c->getLockingProvider()
-			);
-			return $manager;
-		});
-	}
-
-	/**
-	 * @return \OCP\Contacts\IManager
-	 */
-	public function getContactsManager() {
-		return $this->query('ContactsManager');
-	}
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 */
-	public function getEncryptionManager() {
-		return $this->query('EncryptionManager');
-	}
-
-	/**
-	 * @return \OC\Encryption\File
-	 */
-	public function getEncryptionFilesHelper() {
-		return $this->query('EncryptionFileHelper');
-	}
-
-	/**
-	 * @return \OCP\Encryption\Keys\IStorage
-	 */
-	public function getEncryptionKeyStorage() {
-		return $this->query('EncryptionKeyStorage');
-	}
-
-	/**
-	 * The current request object holding all information about the request
-	 * currently being processed is returned from this method.
-	 * In case the current execution was not initiated by a web request null is returned
-	 *
-	 * @return \OCP\IRequest
-	 */
-	public function getRequest() {
-		return $this->query('Request');
-	}
-
-	/**
-	 * Returns the preview manager which can create preview images for a given file
-	 *
-	 * @return \OCP\IPreview
-	 */
-	public function getPreviewManager() {
-		return $this->query('PreviewManager');
-	}
-
-	/**
-	 * Returns the tag manager which can get and set tags for different object types
-	 *
-	 * @see \OCP\ITagManager::load()
-	 * @return \OCP\ITagManager
-	 */
-	public function getTagManager() {
-		return $this->query('TagManager');
-	}
-
-	/**
-	 * Returns the system-tag manager
-	 *
-	 * @return \OCP\SystemTag\ISystemTagManager
-	 *
-	 * @since 9.0.0
-	 */
-	public function getSystemTagManager() {
-		return $this->query('SystemTagManager');
-	}
-
-	/**
-	 * Returns the system-tag object mapper
-	 *
-	 * @return \OCP\SystemTag\ISystemTagObjectMapper
-	 *
-	 * @since 9.0.0
-	 */
-	public function getSystemTagObjectMapper() {
-		return $this->query('SystemTagObjectMapper');
-	}
-
-
-	/**
-	 * Returns the avatar manager, used for avatar functionality
-	 *
-	 * @return \OCP\IAvatarManager
-	 */
-	public function getAvatarManager() {
-		return $this->query('AvatarManager');
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return \OCP\Files\IRootFolder
-	 */
-	public function getRootFolder() {
-		return $this->query('RootFolder');
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 * This is the lazy variant so this gets only initialized once it
-	 * is actually used.
-	 *
-	 * @return \OCP\Files\IRootFolder
-	 */
-	public function getLazyRootFolder() {
-		return $this->query('LazyRootFolder');
-	}
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder|null
-	 */
-	public function getUserFolder($userId = null) {
-		if ($userId === null) {
-			$user = $this->getUserSession()->getUser();
-			if (!$user) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		$root = $this->getRootFolder();
-		return $root->getUserFolder($userId);
-	}
-
-	/**
-	 * Returns an app-specific view in ownClouds data directory
-	 *
-	 * @return \OCP\Files\Folder
-	 */
-	public function getAppFolder() {
-		$dir = '/' . \OC_App::getCurrentApp();
-		$root = $this->getRootFolder();
-		if (!$root->nodeExists($dir)) {
-			$folder = $root->newFolder($dir);
-		} else {
-			$folder = $root->get($dir);
-		}
-		return $folder;
-	}
-
-	/**
-	 * @return \OC\User\Manager
-	 */
-	public function getUserManager() {
-		return $this->query('UserManager');
-	}
-
-	/**
-	 * @return \OC\Group\Manager
-	 */
-	public function getGroupManager() {
-		return $this->query('GroupManager');
-	}
-
-	/**
-	 * @return \OC\User\Session
-	 */
-	public function getUserSession() {
-		return $this->query('UserSession');
-	}
-
-	/**
-	 * @return \OCP\ISession
-	 */
-	public function getSession() {
-		return $this->query('UserSession')->getSession();
-	}
-
-	/**
-	 * @param \OCP\ISession $session
-	 */
-	public function setSession(\OCP\ISession $session) {
-		return $this->query('UserSession')->setSession($session);
-	}
-
-	/**
-	 * @return \OC\Authentication\TwoFactorAuth\Manager
-	 */
-	public function getTwoFactorAuthManager() {
-		return $this->query('\OC\Authentication\TwoFactorAuth\Manager');
-	}
-
-	/**
-	 * @return \OC\NavigationManager
-	 */
-	public function getNavigationManager() {
-		return $this->query('NavigationManager');
-	}
-
-	/**
-	 * @return \OCP\IConfig
-	 */
-	public function getConfig() {
-		return $this->query('AllConfig');
-	}
-
-	/**
-	 * @internal For internal use only
-	 * @return \OC\SystemConfig
-	 */
-	public function getSystemConfig() {
-		return $this->query('SystemConfig');
-	}
-
-	/**
-	 * Returns the app config manager
-	 *
-	 * @return \OCP\IAppConfig
-	 */
-	public function getAppConfig() {
-		return $this->query('AppConfig');
-	}
-
-	/**
-	 * @return \OCP\L10N\IFactory
-	 */
-	public function getL10NFactory() {
-		return $this->query('L10NFactory');
-	}
-
-	/**
-	 * get an L10N instance
-	 *
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return IL10N
-	 */
-	public function getL10N($app, $lang = null) {
-		return $this->getL10NFactory()->get($app, $lang);
-	}
-
-	/**
-	 * @return \OCP\IURLGenerator
-	 */
-	public function getURLGenerator() {
-		return $this->query('URLGenerator');
-	}
-
-	/**
-	 * @return \OCP\IHelper
-	 */
-	public function getHelper() {
-		return $this->query('AppHelper');
-	}
-
-	/**
-	 * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
-	 * getMemCacheFactory() instead.
-	 *
-	 * @return \OCP\ICache
-	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
-	 */
-	public function getCache() {
-		return $this->query('UserCache');
-	}
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 */
-	public function getMemCacheFactory() {
-		return $this->query('MemCacheFactory');
-	}
-
-	/**
-	 * Returns an \OC\RedisFactory instance
-	 *
-	 * @return \OC\RedisFactory
-	 */
-	public function getGetRedisFactory() {
-		return $this->query('RedisFactory');
-	}
-
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 */
-	public function getDatabaseConnection() {
-		return $this->query('DatabaseConnection');
-	}
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 */
-	public function getActivityManager() {
-		return $this->query('ActivityManager');
-	}
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return \OCP\BackgroundJob\IJobList
-	 */
-	public function getJobList() {
-		return $this->query('JobList');
-	}
-
-	/**
-	 * Returns a logger instance
-	 *
-	 * @return \OCP\ILogger
-	 */
-	public function getLogger() {
-		return $this->query('Logger');
-	}
-
-	/**
-	 * Returns a router for generating and matching urls
-	 *
-	 * @return \OCP\Route\IRouter
-	 */
-	public function getRouter() {
-		return $this->query('Router');
-	}
-
-	/**
-	 * Returns a search instance
-	 *
-	 * @return \OCP\ISearch
-	 */
-	public function getSearch() {
-		return $this->query('Search');
-	}
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 */
-	public function getSecureRandom() {
-		return $this->query('SecureRandom');
-	}
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return \OCP\Security\ICrypto
-	 */
-	public function getCrypto() {
-		return $this->query('Crypto');
-	}
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return \OCP\Security\IHasher
-	 */
-	public function getHasher() {
-		return $this->query('Hasher');
-	}
-
-	/**
-	 * Returns a CredentialsManager instance
-	 *
-	 * @return \OCP\Security\ICredentialsManager
-	 */
-	public function getCredentialsManager() {
-		return $this->query('CredentialsManager');
-	}
-
-	/**
-	 * Returns an instance of the db facade
-	 *
-	 * @deprecated use getDatabaseConnection, will be removed in ownCloud 10
-	 * @return \OCP\IDb
-	 */
-	public function getDb() {
-		return $this->query('Db');
-	}
-
-	/**
-	 * Returns an instance of the HTTP helper class
-	 *
-	 * @deprecated Use getHTTPClientService()
-	 * @return \OC\HTTPHelper
-	 */
-	public function getHTTPHelper() {
-		return $this->query('HTTPHelper');
-	}
-
-	/**
-	 * Get the certificate manager for the user
-	 *
-	 * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
-	 * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
-	 */
-	public function getCertificateManager($userId = '') {
-		if ($userId === '') {
-			$userSession = $this->getUserSession();
-			$user = $userSession->getUser();
-			if (is_null($user)) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		return new CertificateManager($userId, new View(), $this->getConfig());
-	}
-
-	/**
-	 * Returns an instance of the HTTP client service
-	 *
-	 * @return \OCP\Http\Client\IClientService
-	 */
-	public function getHTTPClientService() {
-		return $this->query('HttpClientService');
-	}
-
-	/**
-	 * Create a new event source
-	 *
-	 * @return \OCP\IEventSource
-	 */
-	public function createEventSource() {
-		return new \OC_EventSource();
-	}
-
-	/**
-	 * Get the active event logger
-	 *
-	 * The returned logger only logs data when debug mode is enabled
-	 *
-	 * @return \OCP\Diagnostics\IEventLogger
-	 */
-	public function getEventLogger() {
-		return $this->query('EventLogger');
-	}
-
-	/**
-	 * Get the active query logger
-	 *
-	 * The returned logger only logs data when debug mode is enabled
-	 *
-	 * @return \OCP\Diagnostics\IQueryLogger
-	 */
-	public function getQueryLogger() {
-		return $this->query('QueryLogger');
-	}
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 */
-	public function getTempManager() {
-		return $this->query('TempManager');
-	}
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 */
-	public function getAppManager() {
-		return $this->query('AppManager');
-	}
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return \OCP\Mail\IMailer
-	 */
-	public function getMailer() {
-		return $this->query('Mailer');
-	}
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 */
-	public function getWebRoot() {
-		return $this->webRoot;
-	}
-
-	/**
-	 * @return \OC\OCSClient
-	 */
-	public function getOcsClient() {
-		return $this->query('OcsClient');
-	}
-
-	/**
-	 * @return \OCP\IDateTimeZone
-	 */
-	public function getDateTimeZone() {
-		return $this->query('DateTimeZone');
-	}
-
-	/**
-	 * @return \OCP\IDateTimeFormatter
-	 */
-	public function getDateTimeFormatter() {
-		return $this->query('DateTimeFormatter');
-	}
-
-	/**
-	 * @return \OCP\Files\Config\IMountProviderCollection
-	 */
-	public function getMountProviderCollection() {
-		return $this->query('MountConfigManager');
-	}
-
-	/**
-	 * Get the IniWrapper
-	 *
-	 * @return IniGetWrapper
-	 */
-	public function getIniWrapper() {
-		return $this->query('IniWrapper');
-	}
-
-	/**
-	 * @return \OCP\Command\IBus
-	 */
-	public function getCommandBus() {
-		return $this->query('AsyncCommandBus');
-	}
-
-	/**
-	 * Get the trusted domain helper
-	 *
-	 * @return TrustedDomainHelper
-	 */
-	public function getTrustedDomainHelper() {
-		return $this->query('TrustedDomainHelper');
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return \OCP\Lock\ILockingProvider
-	 * @since 8.1.0
-	 */
-	public function getLockingProvider() {
-		return $this->query('LockingProvider');
-	}
-
-	/**
-	 * @return \OCP\Files\Mount\IMountManager
-	 **/
-	function getMountManager() {
-		return $this->query('MountManager');
-	}
-
-	/** @return \OCP\Files\Config\IUserMountCache */
-	function getUserMountCache() {
-		return $this->query('UserMountCache');
-	}
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return \OCP\Files\IMimeTypeDetector
-	 */
-	public function getMimeTypeDetector() {
-		return $this->query('MimeTypeDetector');
-	}
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return \OCP\Files\IMimeTypeLoader
-	 */
-	public function getMimeTypeLoader() {
-		return $this->query('MimeTypeLoader');
-	}
-
-	/**
-	 * Get the manager of all the capabilities
-	 *
-	 * @return \OC\CapabilitiesManager
-	 */
-	public function getCapabilitiesManager() {
-		return $this->query('CapabilitiesManager');
-	}
-
-	/**
-	 * Get the EventDispatcher
-	 *
-	 * @return EventDispatcherInterface
-	 * @since 8.2.0
-	 */
-	public function getEventDispatcher() {
-		return $this->query('EventDispatcher');
-	}
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 8.2.0
-	 */
-	public function getNotificationManager() {
-		return $this->query('NotificationManager');
-	}
-
-	/**
-	 * @return \OCP\Comments\ICommentsManager
-	 */
-	public function getCommentsManager() {
-		return $this->query('CommentsManager');
-	}
-
-	/**
-	 * @internal Not public by intention.
-	 * @return \OC_Defaults
-	 */
-	public function getThemingDefaults() {
-		return $this->query('ThemingDefaults');
-	}
-
-	/**
-	 * @return \OC\IntegrityCheck\Checker
-	 */
-	public function getIntegrityCodeChecker() {
-		return $this->query('IntegrityCodeChecker');
-	}
-
-	/**
-	 * @return \OC\Session\CryptoWrapper
-	 */
-	public function getSessionCryptoWrapper() {
-		return $this->query('CryptoWrapper');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 */
-	public function getCsrfTokenManager() {
-		return $this->query('CsrfTokenManager');
-	}
-
-	/**
-	 * @return Throttler
-	 */
-	public function getBruteForceThrottler() {
-		return $this->query('Throttler');
-	}
-
-	/**
-	 * @return IContentSecurityPolicyManager
-	 */
-	public function getContentSecurityPolicyManager() {
-		return $this->query('ContentSecurityPolicyManager');
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\BackendService
-	 */
-	public function getStoragesBackendService() {
-		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\BackendService');
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\GlobalStoragesService
-	 */
-	public function getGlobalStoragesService() {
-		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\GlobalStoragesService');
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\UserGlobalStoragesService
-	 */
-	public function getUserGlobalStoragesService() {
-		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserGlobalStoragesService');
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\UserStoragesService
-	 */
-	public function getUserStoragesService() {
-		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserStoragesService');
-	}
-
-	/**
-	 * @return \OCP\Share\IManager
-	 */
-	public function getShareManager() {
-		return $this->query('ShareManager');
-	}
-
-	/**
-	 * Returns the LDAP Provider
-	 *
-	 * @return \OCP\LDAP\ILDAPProvider
-	 */
-	public function getLDAPProvider() {
-		return $this->query('LDAPProvider');
-	}
-
-	/**
-	 * @return \OCP\Settings\IManager
-	 */
-	public function getSettingsManager() {
-		return $this->query('SettingsManager');
-	}
+            $prefixes = \OC::$composerAutoloader->getPrefixesPsr4();
+            if (isset($prefixes['OCA\\Theming\\'])) {
+                $classExists = true;
+            } else {
+                $classExists = false;
+            }
+
+            if ($classExists && $this->getConfig()->getSystemValue('installed', false) && $this->getAppManager()->isInstalled('theming')) {
+                return new ThemingDefaults(
+                    $this->getConfig(),
+                    $this->getL10N('theming'),
+                    $this->getURLGenerator(),
+                    new \OC_Defaults()
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService('EventDispatcher', function () {
+            return new EventDispatcher();
+        });
+        $this->registerService('CryptoWrapper', function (Server $c) {
+            // FIXME: Instantiiated here due to cyclic dependency
+            $request = new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : null,
+                ],
+                $c->getSecureRandom(),
+                $c->getConfig()
+            );
+
+            return new CryptoWrapper(
+                $c->getConfig(),
+                $c->getCrypto(),
+                $c->getSecureRandom(),
+                $request
+            );
+        });
+        $this->registerService('CsrfTokenManager', function (Server $c) {
+            $tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
+            $sessionStorage = new SessionStorage($c->getSession());
+
+            return new CsrfTokenManager(
+                $tokenGenerator,
+                $sessionStorage
+            );
+        });
+        $this->registerService('ContentSecurityPolicyManager', function (Server $c) {
+            return new ContentSecurityPolicyManager();
+        });
+        $this->registerService('ShareManager', function(Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', '\OC\Share20\ProviderFactory');
+            /** @var \OCP\Share\IProviderFactory $factory */
+            $factory = new $factoryClass($this);
+
+            $manager = new \OC\Share20\Manager(
+                $c->getLogger(),
+                $c->getConfig(),
+                $c->getSecureRandom(),
+                $c->getHasher(),
+                $c->getMountManager(),
+                $c->getGroupManager(),
+                $c->getL10N('core'),
+                $factory,
+                $c->getUserManager(),
+                $c->getLazyRootFolder(),
+                $c->getEventDispatcher()
+            );
+
+            return $manager;
+        });
+        $this->registerService('SettingsManager', function(Server $c) {
+            $manager = new \OC\Settings\Manager(
+                $c->getLogger(),
+                $c->getDatabaseConnection(),
+                $c->getL10N('lib'),
+                $c->getConfig(),
+                $c->getEncryptionManager(),
+                $c->getUserManager(),
+                $c->getLockingProvider()
+            );
+            return $manager;
+        });
+    }
+
+    /**
+     * @return \OCP\Contacts\IManager
+     */
+    public function getContactsManager() {
+        return $this->query('ContactsManager');
+    }
+
+    /**
+     * @return \OC\Encryption\Manager
+     */
+    public function getEncryptionManager() {
+        return $this->query('EncryptionManager');
+    }
+
+    /**
+     * @return \OC\Encryption\File
+     */
+    public function getEncryptionFilesHelper() {
+        return $this->query('EncryptionFileHelper');
+    }
+
+    /**
+     * @return \OCP\Encryption\Keys\IStorage
+     */
+    public function getEncryptionKeyStorage() {
+        return $this->query('EncryptionKeyStorage');
+    }
+
+    /**
+     * The current request object holding all information about the request
+     * currently being processed is returned from this method.
+     * In case the current execution was not initiated by a web request null is returned
+     *
+     * @return \OCP\IRequest
+     */
+    public function getRequest() {
+        return $this->query('Request');
+    }
+
+    /**
+     * Returns the preview manager which can create preview images for a given file
+     *
+     * @return \OCP\IPreview
+     */
+    public function getPreviewManager() {
+        return $this->query('PreviewManager');
+    }
+
+    /**
+     * Returns the tag manager which can get and set tags for different object types
+     *
+     * @see \OCP\ITagManager::load()
+     * @return \OCP\ITagManager
+     */
+    public function getTagManager() {
+        return $this->query('TagManager');
+    }
+
+    /**
+     * Returns the system-tag manager
+     *
+     * @return \OCP\SystemTag\ISystemTagManager
+     *
+     * @since 9.0.0
+     */
+    public function getSystemTagManager() {
+        return $this->query('SystemTagManager');
+    }
+
+    /**
+     * Returns the system-tag object mapper
+     *
+     * @return \OCP\SystemTag\ISystemTagObjectMapper
+     *
+     * @since 9.0.0
+     */
+    public function getSystemTagObjectMapper() {
+        return $this->query('SystemTagObjectMapper');
+    }
+
+
+    /**
+     * Returns the avatar manager, used for avatar functionality
+     *
+     * @return \OCP\IAvatarManager
+     */
+    public function getAvatarManager() {
+        return $this->query('AvatarManager');
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return \OCP\Files\IRootFolder
+     */
+    public function getRootFolder() {
+        return $this->query('RootFolder');
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     * This is the lazy variant so this gets only initialized once it
+     * is actually used.
+     *
+     * @return \OCP\Files\IRootFolder
+     */
+    public function getLazyRootFolder() {
+        return $this->query('LazyRootFolder');
+    }
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder|null
+     */
+    public function getUserFolder($userId = null) {
+        if ($userId === null) {
+            $user = $this->getUserSession()->getUser();
+            if (!$user) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        $root = $this->getRootFolder();
+        return $root->getUserFolder($userId);
+    }
+
+    /**
+     * Returns an app-specific view in ownClouds data directory
+     *
+     * @return \OCP\Files\Folder
+     */
+    public function getAppFolder() {
+        $dir = '/' . \OC_App::getCurrentApp();
+        $root = $this->getRootFolder();
+        if (!$root->nodeExists($dir)) {
+            $folder = $root->newFolder($dir);
+        } else {
+            $folder = $root->get($dir);
+        }
+        return $folder;
+    }
+
+    /**
+     * @return \OC\User\Manager
+     */
+    public function getUserManager() {
+        return $this->query('UserManager');
+    }
+
+    /**
+     * @return \OC\Group\Manager
+     */
+    public function getGroupManager() {
+        return $this->query('GroupManager');
+    }
+
+    /**
+     * @return \OC\User\Session
+     */
+    public function getUserSession() {
+        return $this->query('UserSession');
+    }
+
+    /**
+     * @return \OCP\ISession
+     */
+    public function getSession() {
+        return $this->query('UserSession')->getSession();
+    }
+
+    /**
+     * @param \OCP\ISession $session
+     */
+    public function setSession(\OCP\ISession $session) {
+        return $this->query('UserSession')->setSession($session);
+    }
+
+    /**
+     * @return \OC\Authentication\TwoFactorAuth\Manager
+     */
+    public function getTwoFactorAuthManager() {
+        return $this->query('\OC\Authentication\TwoFactorAuth\Manager');
+    }
+
+    /**
+     * @return \OC\NavigationManager
+     */
+    public function getNavigationManager() {
+        return $this->query('NavigationManager');
+    }
+
+    /**
+     * @return \OCP\IConfig
+     */
+    public function getConfig() {
+        return $this->query('AllConfig');
+    }
+
+    /**
+     * @internal For internal use only
+     * @return \OC\SystemConfig
+     */
+    public function getSystemConfig() {
+        return $this->query('SystemConfig');
+    }
+
+    /**
+     * Returns the app config manager
+     *
+     * @return \OCP\IAppConfig
+     */
+    public function getAppConfig() {
+        return $this->query('AppConfig');
+    }
+
+    /**
+     * @return \OCP\L10N\IFactory
+     */
+    public function getL10NFactory() {
+        return $this->query('L10NFactory');
+    }
+
+    /**
+     * get an L10N instance
+     *
+     * @param string $app appid
+     * @param string $lang
+     * @return IL10N
+     */
+    public function getL10N($app, $lang = null) {
+        return $this->getL10NFactory()->get($app, $lang);
+    }
+
+    /**
+     * @return \OCP\IURLGenerator
+     */
+    public function getURLGenerator() {
+        return $this->query('URLGenerator');
+    }
+
+    /**
+     * @return \OCP\IHelper
+     */
+    public function getHelper() {
+        return $this->query('AppHelper');
+    }
+
+    /**
+     * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
+     * getMemCacheFactory() instead.
+     *
+     * @return \OCP\ICache
+     * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
+     */
+    public function getCache() {
+        return $this->query('UserCache');
+    }
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     */
+    public function getMemCacheFactory() {
+        return $this->query('MemCacheFactory');
+    }
+
+    /**
+     * Returns an \OC\RedisFactory instance
+     *
+     * @return \OC\RedisFactory
+     */
+    public function getGetRedisFactory() {
+        return $this->query('RedisFactory');
+    }
+
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     */
+    public function getDatabaseConnection() {
+        return $this->query('DatabaseConnection');
+    }
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     */
+    public function getActivityManager() {
+        return $this->query('ActivityManager');
+    }
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return \OCP\BackgroundJob\IJobList
+     */
+    public function getJobList() {
+        return $this->query('JobList');
+    }
+
+    /**
+     * Returns a logger instance
+     *
+     * @return \OCP\ILogger
+     */
+    public function getLogger() {
+        return $this->query('Logger');
+    }
+
+    /**
+     * Returns a router for generating and matching urls
+     *
+     * @return \OCP\Route\IRouter
+     */
+    public function getRouter() {
+        return $this->query('Router');
+    }
+
+    /**
+     * Returns a search instance
+     *
+     * @return \OCP\ISearch
+     */
+    public function getSearch() {
+        return $this->query('Search');
+    }
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     */
+    public function getSecureRandom() {
+        return $this->query('SecureRandom');
+    }
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return \OCP\Security\ICrypto
+     */
+    public function getCrypto() {
+        return $this->query('Crypto');
+    }
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return \OCP\Security\IHasher
+     */
+    public function getHasher() {
+        return $this->query('Hasher');
+    }
+
+    /**
+     * Returns a CredentialsManager instance
+     *
+     * @return \OCP\Security\ICredentialsManager
+     */
+    public function getCredentialsManager() {
+        return $this->query('CredentialsManager');
+    }
+
+    /**
+     * Returns an instance of the db facade
+     *
+     * @deprecated use getDatabaseConnection, will be removed in ownCloud 10
+     * @return \OCP\IDb
+     */
+    public function getDb() {
+        return $this->query('Db');
+    }
+
+    /**
+     * Returns an instance of the HTTP helper class
+     *
+     * @deprecated Use getHTTPClientService()
+     * @return \OC\HTTPHelper
+     */
+    public function getHTTPHelper() {
+        return $this->query('HTTPHelper');
+    }
+
+    /**
+     * Get the certificate manager for the user
+     *
+     * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
+     * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
+     */
+    public function getCertificateManager($userId = '') {
+        if ($userId === '') {
+            $userSession = $this->getUserSession();
+            $user = $userSession->getUser();
+            if (is_null($user)) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        return new CertificateManager($userId, new View(), $this->getConfig());
+    }
+
+    /**
+     * Returns an instance of the HTTP client service
+     *
+     * @return \OCP\Http\Client\IClientService
+     */
+    public function getHTTPClientService() {
+        return $this->query('HttpClientService');
+    }
+
+    /**
+     * Create a new event source
+     *
+     * @return \OCP\IEventSource
+     */
+    public function createEventSource() {
+        return new \OC_EventSource();
+    }
+
+    /**
+     * Get the active event logger
+     *
+     * The returned logger only logs data when debug mode is enabled
+     *
+     * @return \OCP\Diagnostics\IEventLogger
+     */
+    public function getEventLogger() {
+        return $this->query('EventLogger');
+    }
+
+    /**
+     * Get the active query logger
+     *
+     * The returned logger only logs data when debug mode is enabled
+     *
+     * @return \OCP\Diagnostics\IQueryLogger
+     */
+    public function getQueryLogger() {
+        return $this->query('QueryLogger');
+    }
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     */
+    public function getTempManager() {
+        return $this->query('TempManager');
+    }
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     */
+    public function getAppManager() {
+        return $this->query('AppManager');
+    }
+
+    /**
+     * Creates a new mailer
+     *
+     * @return \OCP\Mail\IMailer
+     */
+    public function getMailer() {
+        return $this->query('Mailer');
+    }
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     */
+    public function getWebRoot() {
+        return $this->webRoot;
+    }
+
+    /**
+     * @return \OC\OCSClient
+     */
+    public function getOcsClient() {
+        return $this->query('OcsClient');
+    }
+
+    /**
+     * @return \OCP\IDateTimeZone
+     */
+    public function getDateTimeZone() {
+        return $this->query('DateTimeZone');
+    }
+
+    /**
+     * @return \OCP\IDateTimeFormatter
+     */
+    public function getDateTimeFormatter() {
+        return $this->query('DateTimeFormatter');
+    }
+
+    /**
+     * @return \OCP\Files\Config\IMountProviderCollection
+     */
+    public function getMountProviderCollection() {
+        return $this->query('MountConfigManager');
+    }
+
+    /**
+     * Get the IniWrapper
+     *
+     * @return IniGetWrapper
+     */
+    public function getIniWrapper() {
+        return $this->query('IniWrapper');
+    }
+
+    /**
+     * @return \OCP\Command\IBus
+     */
+    public function getCommandBus() {
+        return $this->query('AsyncCommandBus');
+    }
+
+    /**
+     * Get the trusted domain helper
+     *
+     * @return TrustedDomainHelper
+     */
+    public function getTrustedDomainHelper() {
+        return $this->query('TrustedDomainHelper');
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return \OCP\Lock\ILockingProvider
+     * @since 8.1.0
+     */
+    public function getLockingProvider() {
+        return $this->query('LockingProvider');
+    }
+
+    /**
+     * @return \OCP\Files\Mount\IMountManager
+     **/
+    function getMountManager() {
+        return $this->query('MountManager');
+    }
+
+    /** @return \OCP\Files\Config\IUserMountCache */
+    function getUserMountCache() {
+        return $this->query('UserMountCache');
+    }
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return \OCP\Files\IMimeTypeDetector
+     */
+    public function getMimeTypeDetector() {
+        return $this->query('MimeTypeDetector');
+    }
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return \OCP\Files\IMimeTypeLoader
+     */
+    public function getMimeTypeLoader() {
+        return $this->query('MimeTypeLoader');
+    }
+
+    /**
+     * Get the manager of all the capabilities
+     *
+     * @return \OC\CapabilitiesManager
+     */
+    public function getCapabilitiesManager() {
+        return $this->query('CapabilitiesManager');
+    }
+
+    /**
+     * Get the EventDispatcher
+     *
+     * @return EventDispatcherInterface
+     * @since 8.2.0
+     */
+    public function getEventDispatcher() {
+        return $this->query('EventDispatcher');
+    }
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 8.2.0
+     */
+    public function getNotificationManager() {
+        return $this->query('NotificationManager');
+    }
+
+    /**
+     * @return \OCP\Comments\ICommentsManager
+     */
+    public function getCommentsManager() {
+        return $this->query('CommentsManager');
+    }
+
+    /**
+     * @internal Not public by intention.
+     * @return \OC_Defaults
+     */
+    public function getThemingDefaults() {
+        return $this->query('ThemingDefaults');
+    }
+
+    /**
+     * @return \OC\IntegrityCheck\Checker
+     */
+    public function getIntegrityCodeChecker() {
+        return $this->query('IntegrityCodeChecker');
+    }
+
+    /**
+     * @return \OC\Session\CryptoWrapper
+     */
+    public function getSessionCryptoWrapper() {
+        return $this->query('CryptoWrapper');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     */
+    public function getCsrfTokenManager() {
+        return $this->query('CsrfTokenManager');
+    }
+
+    /**
+     * @return Throttler
+     */
+    public function getBruteForceThrottler() {
+        return $this->query('Throttler');
+    }
+
+    /**
+     * @return IContentSecurityPolicyManager
+     */
+    public function getContentSecurityPolicyManager() {
+        return $this->query('ContentSecurityPolicyManager');
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\BackendService
+     */
+    public function getStoragesBackendService() {
+        return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\BackendService');
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\GlobalStoragesService
+     */
+    public function getGlobalStoragesService() {
+        return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\GlobalStoragesService');
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\UserGlobalStoragesService
+     */
+    public function getUserGlobalStoragesService() {
+        return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserGlobalStoragesService');
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\UserStoragesService
+     */
+    public function getUserStoragesService() {
+        return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserStoragesService');
+    }
+
+    /**
+     * @return \OCP\Share\IManager
+     */
+    public function getShareManager() {
+        return $this->query('ShareManager');
+    }
+
+    /**
+     * Returns the LDAP Provider
+     *
+     * @return \OCP\LDAP\ILDAPProvider
+     */
+    public function getLDAPProvider() {
+        return $this->query('LDAPProvider');
+    }
+
+    /**
+     * @return \OCP\Settings\IManager
+     */
+    public function getSettingsManager() {
+        return $this->query('SettingsManager');
+    }
 }

Spacing +91 added lines, -91 removed lines

@@ -108,15 +108,15 @@ 
 		parent::__construct();
 		$this->webRoot = $webRoot;
 
-		$this->registerService('ContactsManager', function ($c) {
+		$this->registerService('ContactsManager', function($c) {
 			return new ContactsManager();
 		});
 
-		$this->registerService('PreviewManager', function (Server $c) {
+		$this->registerService('PreviewManager', function(Server $c) {
 			return new PreviewManager($c->getConfig());
 		});
 
-		$this->registerService('EncryptionManager', function (Server $c) {
+		$this->registerService('EncryptionManager', function(Server $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -134,7 +134,7 @@ 
 			);
 		});
 
-		$this->registerService('EncryptionFileHelper', function (Server $c) {
+		$this->registerService('EncryptionFileHelper', function(Server $c) {
 			$util = new Encryption\Util(
 				new View(),
 				$c->getUserManager(),
@@ -144,7 +144,7 @@ 
 			return new Encryption\File($util);
 		});
 
-		$this->registerService('EncryptionKeyStorage', function (Server $c) {
+		$this->registerService('EncryptionKeyStorage', function(Server $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -155,27 +155,27 @@ 
 
 			return new Encryption\Keys\Storage($view, $util);
 		});
-		$this->registerService('TagMapper', function (Server $c) {
+		$this->registerService('TagMapper', function(Server $c) {
 			return new TagMapper($c->getDatabaseConnection());
 		});
-		$this->registerService('TagManager', function (Server $c) {
+		$this->registerService('TagManager', function(Server $c) {
 			$tagMapper = $c->query('TagMapper');
 			return new TagManager($tagMapper, $c->getUserSession());
 		});
-		$this->registerService('SystemTagManagerFactory', function (Server $c) {
+		$this->registerService('SystemTagManagerFactory', function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('systemtags.managerFactory', '\OC\SystemTag\ManagerFactory');
 			/** @var \OC\SystemTag\ManagerFactory $factory */
 			$factory = new $factoryClass($this);
 			return $factory;
 		});
-		$this->registerService('SystemTagManager', function (Server $c) {
+		$this->registerService('SystemTagManager', function(Server $c) {
 			return $c->query('SystemTagManagerFactory')->getManager();
 		});
-		$this->registerService('SystemTagObjectMapper', function (Server $c) {
+		$this->registerService('SystemTagObjectMapper', function(Server $c) {
 			return $c->query('SystemTagManagerFactory')->getObjectMapper();
 		});
-		$this->registerService('RootFolder', function () {
+		$this->registerService('RootFolder', function() {
 			$manager = \OC\Files\Filesystem::getMountManager(null);
 			$view = new View();
 			$root = new Root($manager, $view, null);
@@ -188,39 +188,39 @@ 
 				return $c->getRootFolder();
 			});
 		});
-		$this->registerService('UserManager', function (Server $c) {
+		$this->registerService('UserManager', function(Server $c) {
 			$config = $c->getConfig();
 			return new \OC\User\Manager($config);
 		});
-		$this->registerService('GroupManager', function (Server $c) {
+		$this->registerService('GroupManager', function(Server $c) {
 			$groupManager = new \OC\Group\Manager($this->getUserManager());
-			$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
+			$groupManager->listen('\OC\Group', 'preCreate', function($gid) {
 				\OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));
 			});
-			$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) {
+			$groupManager->listen('\OC\Group', 'postCreate', function(\OC\Group\Group $gid) {
 				\OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID()));
 			});
-			$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'preDelete', function(\OC\Group\Group $group) {
 				\OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID()));
 			});
-			$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'postDelete', function(\OC\Group\Group $group) {
 				\OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID()));
 			});
-			$groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'preAddUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				\OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()));
 			});
-			$groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'postAddUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				\OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
 				//Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
 				\OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
 			});
 			return $groupManager;
 		});
-		$this->registerService('OC\Authentication\Token\DefaultTokenMapper', function (Server $c) {
+		$this->registerService('OC\Authentication\Token\DefaultTokenMapper', function(Server $c) {
 			$dbConnection = $c->getDatabaseConnection();
 			return new Authentication\Token\DefaultTokenMapper($dbConnection);
 		});
-		$this->registerService('OC\Authentication\Token\DefaultTokenProvider', function (Server $c) {
+		$this->registerService('OC\Authentication\Token\DefaultTokenProvider', function(Server $c) {
 			$mapper = $c->query('OC\Authentication\Token\DefaultTokenMapper');
 			$crypto = $c->getCrypto();
 			$config = $c->getConfig();
@@ -229,7 +229,7 @@ 
 			return new \OC\Authentication\Token\DefaultTokenProvider($mapper, $crypto, $config, $logger, $timeFactory);
 		});
 		$this->registerAlias('OC\Authentication\Token\IProvider', 'OC\Authentication\Token\DefaultTokenProvider');
-		$this->registerService('UserSession', function (Server $c) {
+		$this->registerService('UserSession', function(Server $c) {
 			$manager = $c->getUserManager();
 			$session = new \OC\Session\Memory('');
 			$timeFactory = new TimeFactory();
@@ -242,65 +242,65 @@ 
 			}
 
 			$userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig());
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preCreateUser', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
 			});
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postCreateUser', function($user, $password) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
 			});
-			$userSession->listen('\OC\User', 'preDelete', function ($user) {
+			$userSession->listen('\OC\User', 'preDelete', function($user) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
 			});
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
+			$userSession->listen('\OC\User', 'postDelete', function($user) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
 			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'preSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
 			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'postSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
 			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preLogin', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
 			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postLogin', function($user, $password) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
 			});
-			$userSession->listen('\OC\User', 'logout', function () {
+			$userSession->listen('\OC\User', 'logout', function() {
 				\OC_Hook::emit('OC_User', 'logout', array());
 			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value) {
+			$userSession->listen('\OC\User', 'changeUser', function($user, $feature, $value) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value));
 			});
 			return $userSession;
 		});
 
-		$this->registerService('\OC\Authentication\TwoFactorAuth\Manager', function (Server $c) {
+		$this->registerService('\OC\Authentication\TwoFactorAuth\Manager', function(Server $c) {
 			return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig());
 		});
 
-		$this->registerService('NavigationManager', function ($c) {
+		$this->registerService('NavigationManager', function($c) {
 			return new \OC\NavigationManager();
 		});
-		$this->registerService('AllConfig', function (Server $c) {
+		$this->registerService('AllConfig', function(Server $c) {
 			return new \OC\AllConfig(
 				$c->getSystemConfig()
 			);
 		});
-		$this->registerService('SystemConfig', function ($c) use ($config) {
+		$this->registerService('SystemConfig', function($c) use ($config) {
 			return new \OC\SystemConfig($config);
 		});
-		$this->registerService('AppConfig', function (Server $c) {
+		$this->registerService('AppConfig', function(Server $c) {
 			return new \OC\AppConfig($c->getDatabaseConnection());
 		});
-		$this->registerService('L10NFactory', function (Server $c) {
+		$this->registerService('L10NFactory', function(Server $c) {
 			return new \OC\L10N\Factory(
 				$c->getConfig(),
 				$c->getRequest(),
@@ -308,7 +308,7 @@ 
 				\OC::$SERVERROOT
 			);
 		});
-		$this->registerService('URLGenerator', function (Server $c) {
+		$this->registerService('URLGenerator', function(Server $c) {
 			$config = $c->getConfig();
 			$cacheFactory = $c->getMemCacheFactory();
 			return new \OC\URLGenerator(
@@ -316,22 +316,22 @@ 
 				$cacheFactory
 			);
 		});
-		$this->registerService('AppHelper', function ($c) {
+		$this->registerService('AppHelper', function($c) {
 			return new \OC\AppHelper();
 		});
-		$this->registerService('UserCache', function ($c) {
+		$this->registerService('UserCache', function($c) {
 			return new Cache\File();
 		});
-		$this->registerService('MemCacheFactory', function (Server $c) {
+		$this->registerService('MemCacheFactory', function(Server $c) {
 			$config = $c->getConfig();
 
 			if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
 				$v = \OC_App::getAppVersions();
-				$v['core'] = md5(file_get_contents(\OC::$SERVERROOT . '/version.php'));
+				$v['core'] = md5(file_get_contents(\OC::$SERVERROOT.'/version.php'));
 				$version = implode(',', $v);
 				$instanceId = \OC_Util::getInstanceId();
 				$path = \OC::$SERVERROOT;
-				$prefix = md5($instanceId . '-' . $version . '-' . $path);
+				$prefix = md5($instanceId.'-'.$version.'-'.$path);
 				return new \OC\Memcache\Factory($prefix, $c->getLogger(),
 					$config->getSystemValue('memcache.local', null),
 					$config->getSystemValue('memcache.distributed', null),
@@ -345,18 +345,18 @@ 
 				'\\OC\\Memcache\\ArrayCache'
 			);
 		});
-		$this->registerService('RedisFactory', function (Server $c) {
+		$this->registerService('RedisFactory', function(Server $c) {
 			$systemConfig = $c->getSystemConfig();
 			return new RedisFactory($systemConfig);
 		});
-		$this->registerService('ActivityManager', function (Server $c) {
+		$this->registerService('ActivityManager', function(Server $c) {
 			return new \OC\Activity\Manager(
 				$c->getRequest(),
 				$c->getUserSession(),
 				$c->getConfig()
 			);
 		});
-		$this->registerService('AvatarManager', function (Server $c) {
+		$this->registerService('AvatarManager', function(Server $c) {
 			return new AvatarManager(
 				$c->getUserManager(),
 				$c->getLazyRootFolder(),
@@ -364,14 +364,14 @@ 
 				$c->getLogger()
 			);
 		});
-		$this->registerService('Logger', function (Server $c) {
+		$this->registerService('Logger', function(Server $c) {
 			$logClass = $c->query('AllConfig')->getSystemValue('log_type', 'owncloud');
-			$logger = 'OC\\Log\\' . ucfirst($logClass);
+			$logger = 'OC\\Log\\'.ucfirst($logClass);
 			call_user_func(array($logger, 'init'));
 
 			return new Log($logger);
 		});
-		$this->registerService('JobList', function (Server $c) {
+		$this->registerService('JobList', function(Server $c) {
 			$config = $c->getConfig();
 			return new \OC\BackgroundJob\JobList(
 				$c->getDatabaseConnection(),
@@ -379,7 +379,7 @@ 
 				new TimeFactory()
 			);
 		});
-		$this->registerService('Router', function (Server $c) {
+		$this->registerService('Router', function(Server $c) {
 			$cacheFactory = $c->getMemCacheFactory();
 			$logger = $c->getLogger();
 			if ($cacheFactory->isAvailable()) {
@@ -389,22 +389,22 @@ 
 			}
 			return $router;
 		});
-		$this->registerService('Search', function ($c) {
+		$this->registerService('Search', function($c) {
 			return new Search();
 		});
-		$this->registerService('SecureRandom', function ($c) {
+		$this->registerService('SecureRandom', function($c) {
 			return new SecureRandom();
 		});
-		$this->registerService('Crypto', function (Server $c) {
+		$this->registerService('Crypto', function(Server $c) {
 			return new Crypto($c->getConfig(), $c->getSecureRandom());
 		});
-		$this->registerService('Hasher', function (Server $c) {
+		$this->registerService('Hasher', function(Server $c) {
 			return new Hasher($c->getConfig());
 		});
-		$this->registerService('CredentialsManager', function (Server $c) {
+		$this->registerService('CredentialsManager', function(Server $c) {
 			return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
 		});
-		$this->registerService('DatabaseConnection', function (Server $c) {
+		$this->registerService('DatabaseConnection', function(Server $c) {
 			$factory = new \OC\DB\ConnectionFactory();
 			$systemConfig = $c->getSystemConfig();
 			$type = $systemConfig->getValue('dbtype', 'sqlite');
@@ -416,17 +416,17 @@ 
 			$connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
 			return $connection;
 		});
-		$this->registerService('Db', function (Server $c) {
+		$this->registerService('Db', function(Server $c) {
 			return new Db($c->getDatabaseConnection());
 		});
-		$this->registerService('HTTPHelper', function (Server $c) {
+		$this->registerService('HTTPHelper', function(Server $c) {
 			$config = $c->getConfig();
 			return new HTTPHelper(
 				$config,
 				$c->getHTTPClientService()
 			);
 		});
-		$this->registerService('HttpClientService', function (Server $c) {
+		$this->registerService('HttpClientService', function(Server $c) {
 			$user = \OC_User::getUser();
 			$uid = $user ? $user : null;
 			return new ClientService(
@@ -434,27 +434,27 @@ 
 				new \OC\Security\CertificateManager($uid, new View(), $c->getConfig())
 			);
 		});
-		$this->registerService('EventLogger', function (Server $c) {
+		$this->registerService('EventLogger', function(Server $c) {
 			if ($c->getSystemConfig()->getValue('debug', false)) {
 				return new EventLogger();
 			} else {
 				return new NullEventLogger();
 			}
 		});
-		$this->registerService('QueryLogger', function (Server $c) {
+		$this->registerService('QueryLogger', function(Server $c) {
 			if ($c->getSystemConfig()->getValue('debug', false)) {
 				return new QueryLogger();
 			} else {
 				return new NullQueryLogger();
 			}
 		});
-		$this->registerService('TempManager', function (Server $c) {
+		$this->registerService('TempManager', function(Server $c) {
 			return new TempManager(
 				$c->getLogger(),
 				$c->getConfig()
 			);
 		});
-		$this->registerService('AppManager', function (Server $c) {
+		$this->registerService('AppManager', function(Server $c) {
 			return new \OC\App\AppManager(
 				$c->getUserSession(),
 				$c->getAppConfig(),
@@ -463,13 +463,13 @@ 
 				$c->getEventDispatcher()
 			);
 		});
-		$this->registerService('DateTimeZone', function (Server $c) {
+		$this->registerService('DateTimeZone', function(Server $c) {
 			return new DateTimeZone(
 				$c->getConfig(),
 				$c->getSession()
 			);
 		});
-		$this->registerService('DateTimeFormatter', function (Server $c) {
+		$this->registerService('DateTimeFormatter', function(Server $c) {
 			$language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
 
 			return new DateTimeFormatter(
@@ -477,16 +477,16 @@ 
 				$c->getL10N('lib', $language)
 			);
 		});
-		$this->registerService('UserMountCache', function (Server $c) {
+		$this->registerService('UserMountCache', function(Server $c) {
 			$mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
 			$listener = new UserMountCacheListener($mountCache);
 			$listener->listen($c->getUserManager());
 			return $mountCache;
 		});
-		$this->registerService('MountConfigManager', function (Server $c) {
+		$this->registerService('MountConfigManager', function(Server $c) {
 			$loader = \OC\Files\Filesystem::getLoader();
 			$mountCache = $c->query('UserMountCache');
-			$manager =  new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
+			$manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
 
 			// builtin providers
 
@@ -497,14 +497,14 @@ 
 
 			return $manager;
 		});
-		$this->registerService('IniWrapper', function ($c) {
+		$this->registerService('IniWrapper', function($c) {
 			return new IniGetWrapper();
 		});
-		$this->registerService('AsyncCommandBus', function (Server $c) {
+		$this->registerService('AsyncCommandBus', function(Server $c) {
 			$jobList = $c->getJobList();
 			return new AsyncBus($jobList);
 		});
-		$this->registerService('TrustedDomainHelper', function ($c) {
+		$this->registerService('TrustedDomainHelper', function($c) {
 			return new TrustedDomainHelper($this->getConfig());
 		});
 		$this->registerService('Throttler', function(Server $c) {
@@ -515,10 +515,10 @@ 
 				$c->getConfig()
 			);
 		});
-		$this->registerService('IntegrityCodeChecker', function (Server $c) {
+		$this->registerService('IntegrityCodeChecker', function(Server $c) {
 			// IConfig and IAppManager requires a working database. This code
 			// might however be called when ownCloud is not yet setup.
-			if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
+			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
 				$config = $c->getConfig();
 				$appManager = $c->getAppManager();
 			} else {
@@ -536,7 +536,7 @@ 
 					$c->getTempManager()
 			);
 		});
-		$this->registerService('Request', function ($c) {
+		$this->registerService('Request', function($c) {
 			if (isset($this['urlParams'])) {
 				$urlParams = $this['urlParams'];
 			} else {
@@ -570,14 +570,14 @@ 
 				$stream
 			);
 		});
-		$this->registerService('Mailer', function (Server $c) {
+		$this->registerService('Mailer', function(Server $c) {
 			return new Mailer(
 				$c->getConfig(),
 				$c->getLogger(),
 				$c->getThemingDefaults()
 			);
 		});
-		$this->registerService('OcsClient', function (Server $c) {
+		$this->registerService('OcsClient', function(Server $c) {
 			return new OCSClient(
 				$this->getHTTPClientService(),
 				$this->getConfig(),
@@ -587,14 +587,14 @@ 
 		$this->registerService('LDAPProvider', function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if(is_null($factoryClass)) {
+			if (is_null($factoryClass)) {
 				throw new \Exception('ldapProviderFactory not set');
 			}
 			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
 			$factory = new $factoryClass($this);
 			return $factory->getLDAPProvider();
 		});
-		$this->registerService('LockingProvider', function (Server $c) {
+		$this->registerService('LockingProvider', function(Server $c) {
 			$ini = $c->getIniWrapper();
 			$config = $c->getConfig();
 			$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
@@ -609,27 +609,27 @@ 
 			}
 			return new NoopLockingProvider();
 		});
-		$this->registerService('MountManager', function () {
+		$this->registerService('MountManager', function() {
 			return new \OC\Files\Mount\Manager();
 		});
-		$this->registerService('MimeTypeDetector', function (Server $c) {
+		$this->registerService('MimeTypeDetector', function(Server $c) {
 			return new \OC\Files\Type\Detection(
 				$c->getURLGenerator(),
 				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
+				\OC::$SERVERROOT.'/resources/config/'
 			);
 		});
-		$this->registerService('MimeTypeLoader', function (Server $c) {
+		$this->registerService('MimeTypeLoader', function(Server $c) {
 			return new \OC\Files\Type\Loader(
 				$c->getDatabaseConnection()
 			);
 		});
-		$this->registerService('NotificationManager', function () {
+		$this->registerService('NotificationManager', function() {
 			return new Manager();
 		});
-		$this->registerService('CapabilitiesManager', function (Server $c) {
+		$this->registerService('CapabilitiesManager', function(Server $c) {
 			$manager = new \OC\CapabilitiesManager();
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return new \OC\OCS\CoreCapabilities($c->getConfig());
 			});
 			return $manager;
@@ -665,10 +665,10 @@ 
 			}
 			return new \OC_Defaults();
 		});
-		$this->registerService('EventDispatcher', function () {
+		$this->registerService('EventDispatcher', function() {
 			return new EventDispatcher();
 		});
-		$this->registerService('CryptoWrapper', function (Server $c) {
+		$this->registerService('CryptoWrapper', function(Server $c) {
 			// FIXME: Instantiiated here due to cyclic dependency
 			$request = new Request(
 				[
@@ -693,7 +693,7 @@ 
 				$request
 			);
 		});
-		$this->registerService('CsrfTokenManager', function (Server $c) {
+		$this->registerService('CsrfTokenManager', function(Server $c) {
 			$tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
 			$sessionStorage = new SessionStorage($c->getSession());
 
@@ -702,7 +702,7 @@ 
 				$sessionStorage
 			);
 		});
-		$this->registerService('ContentSecurityPolicyManager', function (Server $c) {
+		$this->registerService('ContentSecurityPolicyManager', function(Server $c) {
 			return new ContentSecurityPolicyManager();
 		});
 		$this->registerService('ShareManager', function(Server $c) {
@@ -875,7 +875,7 @@ 
 	 * @return \OCP\Files\Folder
 	 */
 	public function getAppFolder() {
-		$dir = '/' . \OC_App::getCurrentApp();
+		$dir = '/'.\OC_App::getCurrentApp();
 		$root = $this->getRootFolder();
 		if (!$root->nodeExists($dir)) {
 			$folder = $root->newFolder($dir);

lib/private/Session/CryptoSessionData.php

Doc Comments +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
 
 	/**
 	 * @param mixed $offset
-	 * @return mixed
+	 * @return string|null
 	 */
 	public function offsetGet($offset) {
 		return $this->get($offset);

Indentation +163 added lines, -163 removed lines

@@ -34,167 +34,167 @@
  * @package OC\Session
  */
 class CryptoSessionData implements \ArrayAccess, ISession {
-	/** @var ISession */
-	protected $session;
-	/** @var \OCP\Security\ICrypto */
-	protected $crypto;
-	/** @var string */
-	protected $passphrase;
-	/** @var array */
-	protected $sessionValues;
-	/** @var bool */
-	protected $isModified = false;
-	CONST encryptedSessionName = 'encrypted_session_data';
-
-	/**
-	 * @param ISession $session
-	 * @param ICrypto $crypto
-	 * @param string $passphrase
-	 */
-	public function __construct(ISession $session,
-								ICrypto $crypto,
-								$passphrase) {
-		$this->crypto = $crypto;
-		$this->session = $session;
-		$this->passphrase = $passphrase;
-		$this->initializeSession();
-	}
-
-	/**
-	 * Close session if class gets destructed
-	 */
-	public function __destruct() {
-		$this->close();
-	}
-
-	protected function initializeSession() {
-		$encryptedSessionData = $this->session->get(self::encryptedSessionName);
-		try {
-			$this->sessionValues = json_decode(
-				$this->crypto->decrypt($encryptedSessionData, $this->passphrase),
-				true
-			);
-		} catch (\Exception $e) {
-			$this->sessionValues = [];
-		}
-	}
-
-	/**
-	 * Set a value in the session
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function set($key, $value) {
-		$this->sessionValues[$key] = $value;
-		$this->isModified = true;
-	}
-
-	/**
-	 * Get a value from the session
-	 *
-	 * @param string $key
-	 * @return string|null Either the value or null
-	 */
-	public function get($key) {
-		if(isset($this->sessionValues[$key])) {
-			return $this->sessionValues[$key];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Check if a named key exists in the session
-	 *
-	 * @param string $key
-	 * @return bool
-	 */
-	public function exists($key) {
-		return isset($this->sessionValues[$key]);
-	}
-
-	/**
-	 * Remove a $key/$value pair from the session
-	 *
-	 * @param string $key
-	 */
-	public function remove($key) {
-		$this->isModified = true;
-		unset($this->sessionValues[$key]);
-		$this->session->remove(self::encryptedSessionName);
-	}
-
-	/**
-	 * Reset and recreate the session
-	 */
-	public function clear() {
-		$this->sessionValues = [];
-		$this->isModified = true;
-		$this->session->clear();
-	}
-
-	/**
-	 * Wrapper around session_regenerate_id
-	 *
-	 * @param bool $deleteOldSession Whether to delete the old associated session file or not.
-	 * @return void
-	 */
-	public function regenerateId($deleteOldSession = true) {
-		$this->session->regenerateId($deleteOldSession);
-	}
-
-	/**
-	 * Wrapper around session_id
-	 *
-	 * @return string
-	 * @throws SessionNotAvailableException
-	 * @since 9.1.0
-	 */
-	public function getId() {
-		return $this->session->getId();
-	}
-
-	/**
-	 * Close the session and release the lock, also writes all changed data in batch
-	 */
-	public function close() {
-		if($this->isModified) {
-			$encryptedValue = $this->crypto->encrypt(json_encode($this->sessionValues), $this->passphrase);
-			$this->session->set(self::encryptedSessionName, $encryptedValue);
-			$this->isModified = false;
-		}
-		$this->session->close();
-	}
-
-	/**
-	 * @param mixed $offset
-	 * @return bool
-	 */
-	public function offsetExists($offset) {
-		return $this->exists($offset);
-	}
-
-	/**
-	 * @param mixed $offset
-	 * @return mixed
-	 */
-	public function offsetGet($offset) {
-		return $this->get($offset);
-	}
-
-	/**
-	 * @param mixed $offset
-	 * @param mixed $value
-	 */
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
-
-	/**
-	 * @param mixed $offset
-	 */
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
+    /** @var ISession */
+    protected $session;
+    /** @var \OCP\Security\ICrypto */
+    protected $crypto;
+    /** @var string */
+    protected $passphrase;
+    /** @var array */
+    protected $sessionValues;
+    /** @var bool */
+    protected $isModified = false;
+    CONST encryptedSessionName = 'encrypted_session_data';
+
+    /**
+     * @param ISession $session
+     * @param ICrypto $crypto
+     * @param string $passphrase
+     */
+    public function __construct(ISession $session,
+                                ICrypto $crypto,
+                                $passphrase) {
+        $this->crypto = $crypto;
+        $this->session = $session;
+        $this->passphrase = $passphrase;
+        $this->initializeSession();
+    }
+
+    /**
+     * Close session if class gets destructed
+     */
+    public function __destruct() {
+        $this->close();
+    }
+
+    protected function initializeSession() {
+        $encryptedSessionData = $this->session->get(self::encryptedSessionName);
+        try {
+            $this->sessionValues = json_decode(
+                $this->crypto->decrypt($encryptedSessionData, $this->passphrase),
+                true
+            );
+        } catch (\Exception $e) {
+            $this->sessionValues = [];
+        }
+    }
+
+    /**
+     * Set a value in the session
+     *
+     * @param string $key
+     * @param mixed $value
+     */
+    public function set($key, $value) {
+        $this->sessionValues[$key] = $value;
+        $this->isModified = true;
+    }
+
+    /**
+     * Get a value from the session
+     *
+     * @param string $key
+     * @return string|null Either the value or null
+     */
+    public function get($key) {
+        if(isset($this->sessionValues[$key])) {
+            return $this->sessionValues[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Check if a named key exists in the session
+     *
+     * @param string $key
+     * @return bool
+     */
+    public function exists($key) {
+        return isset($this->sessionValues[$key]);
+    }
+
+    /**
+     * Remove a $key/$value pair from the session
+     *
+     * @param string $key
+     */
+    public function remove($key) {
+        $this->isModified = true;
+        unset($this->sessionValues[$key]);
+        $this->session->remove(self::encryptedSessionName);
+    }
+
+    /**
+     * Reset and recreate the session
+     */
+    public function clear() {
+        $this->sessionValues = [];
+        $this->isModified = true;
+        $this->session->clear();
+    }
+
+    /**
+     * Wrapper around session_regenerate_id
+     *
+     * @param bool $deleteOldSession Whether to delete the old associated session file or not.
+     * @return void
+     */
+    public function regenerateId($deleteOldSession = true) {
+        $this->session->regenerateId($deleteOldSession);
+    }
+
+    /**
+     * Wrapper around session_id
+     *
+     * @return string
+     * @throws SessionNotAvailableException
+     * @since 9.1.0
+     */
+    public function getId() {
+        return $this->session->getId();
+    }
+
+    /**
+     * Close the session and release the lock, also writes all changed data in batch
+     */
+    public function close() {
+        if($this->isModified) {
+            $encryptedValue = $this->crypto->encrypt(json_encode($this->sessionValues), $this->passphrase);
+            $this->session->set(self::encryptedSessionName, $encryptedValue);
+            $this->isModified = false;
+        }
+        $this->session->close();
+    }
+
+    /**
+     * @param mixed $offset
+     * @return bool
+     */
+    public function offsetExists($offset) {
+        return $this->exists($offset);
+    }
+
+    /**
+     * @param mixed $offset
+     * @return mixed
+     */
+    public function offsetGet($offset) {
+        return $this->get($offset);
+    }
+
+    /**
+     * @param mixed $offset
+     * @param mixed $value
+     */
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
+
+    /**
+     * @param mixed $offset
+     */
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 	 * @return string|null Either the value or null
 	 */
 	public function get($key) {
-		if(isset($this->sessionValues[$key])) {
+		if (isset($this->sessionValues[$key])) {
 			return $this->sessionValues[$key];
 		}
 
@@ -159,7 +159,7 @@ 
 	 * Close the session and release the lock, also writes all changed data in batch
 	 */
 	public function close() {
-		if($this->isModified) {
+		if ($this->isModified) {
 			$encryptedValue = $this->crypto->encrypt(json_encode($this->sessionValues), $this->passphrase);
 			$this->session->set(self::encryptedSessionName, $encryptedValue);
 			$this->isModified = false;