nextcloud / server

themes/example/defaults.php

Indentation +140 added lines, -140 removed lines

@@ -20,145 +20,145 @@
 
 class OC_Theme {
 
-	/**
-	 * Returns the base URL
-	 * @return string URL
-	 */
-	public function getBaseUrl() {
-		return 'https://nextcloud.com';
-	}
-
-	/**
-	 * Returns the URL where the sync clients are listed
-	 * @return string URL
-	 */
-	public function getSyncClientUrl() {
-		return 'https://nextcloud.com/install/#install-clients';
-	}
-
-	/**
-	 * Returns the URL to the App Store for the iOS Client
-	 * @return string URL
-	 */
-	public function getiOSClientUrl() {
-		return 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8';
-	}
-
-	/**
-	 * Returns the AppId for the App Store for the iOS Client
-	 * @return string AppId
-	 */
-	public function getiTunesAppId() {
-		return '1125420102';
-	}
-
-	/**
-	 * Returns the URL to Google Play for the Android Client
-	 * @return string URL
-	 */
-	public function getAndroidClientUrl() {
-		return 'https://play.google.com/store/apps/details?id=com.nextcloud.client';
-	}
-
-	/**
-	 * Returns the documentation URL
-	 * @return string URL
-	 */
-	public function getDocBaseUrl() {
-		return 'https://docs.nextcloud.com';
-	}
-
-	/**
-	 * Returns the title
-	 * @return string title
-	 */
-	public function getTitle() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software
-	 * @return string title
-	 */
-	public function getName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software containing HTML strings
-	 * @return string title
-	 */
-	public function getHTMLName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns entity (e.g. company name) - used for footer, copyright
-	 * @return string entity name
-	 */
-	public function getEntity() {
-		return 'Custom Cloud Co.';
-	}
-
-	/**
-	 * Returns slogan
-	 * @return string slogan
-	 */
-	public function getSlogan() {
-		return 'Your custom cloud, personalized for you!';
-	}
-
-	/**
-	 * Returns logo claim
-	 * @return string logo claim
-	 */
-	public function getLogoClaim() {
-		return '';
-	}
-
-	/**
-	 * Returns short version of the footer
-	 * @return string short footer
-	 */
-	public function getShortFooter() {
-		$footer = '© 2016 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	/**
-	 * Returns long version of the footer
-	 * @return string long footer
-	 */
-	public function getLongFooter() {
-		$footer = '© 2016 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/11/go.php?to=' . $key;
-	}
-
-
-	/**
-	 * Returns mail header color
-	 * @return string
-	 */
-	public function getMailHeaderColor() {
-		return '#745bca';
-	}
-
-	/**
-	 * Returns variables to overload defaults from core/css/variables.scss
-	 * @return array
-	 */
-	public function getScssVariables() {
-		return [
-			'color-primary' => '#745bca'
-		];
-	}
+    /**
+     * Returns the base URL
+     * @return string URL
+     */
+    public function getBaseUrl() {
+        return 'https://nextcloud.com';
+    }
+
+    /**
+     * Returns the URL where the sync clients are listed
+     * @return string URL
+     */
+    public function getSyncClientUrl() {
+        return 'https://nextcloud.com/install/#install-clients';
+    }
+
+    /**
+     * Returns the URL to the App Store for the iOS Client
+     * @return string URL
+     */
+    public function getiOSClientUrl() {
+        return 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8';
+    }
+
+    /**
+     * Returns the AppId for the App Store for the iOS Client
+     * @return string AppId
+     */
+    public function getiTunesAppId() {
+        return '1125420102';
+    }
+
+    /**
+     * Returns the URL to Google Play for the Android Client
+     * @return string URL
+     */
+    public function getAndroidClientUrl() {
+        return 'https://play.google.com/store/apps/details?id=com.nextcloud.client';
+    }
+
+    /**
+     * Returns the documentation URL
+     * @return string URL
+     */
+    public function getDocBaseUrl() {
+        return 'https://docs.nextcloud.com';
+    }
+
+    /**
+     * Returns the title
+     * @return string title
+     */
+    public function getTitle() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software
+     * @return string title
+     */
+    public function getName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software containing HTML strings
+     * @return string title
+     */
+    public function getHTMLName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns entity (e.g. company name) - used for footer, copyright
+     * @return string entity name
+     */
+    public function getEntity() {
+        return 'Custom Cloud Co.';
+    }
+
+    /**
+     * Returns slogan
+     * @return string slogan
+     */
+    public function getSlogan() {
+        return 'Your custom cloud, personalized for you!';
+    }
+
+    /**
+     * Returns logo claim
+     * @return string logo claim
+     */
+    public function getLogoClaim() {
+        return '';
+    }
+
+    /**
+     * Returns short version of the footer
+     * @return string short footer
+     */
+    public function getShortFooter() {
+        $footer = '© 2016 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    /**
+     * Returns long version of the footer
+     * @return string long footer
+     */
+    public function getLongFooter() {
+        $footer = '© 2016 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    public function buildDocLinkToKey($key) {
+        return $this->getDocBaseUrl() . '/server/11/go.php?to=' . $key;
+    }
+
+
+    /**
+     * Returns mail header color
+     * @return string
+     */
+    public function getMailHeaderColor() {
+        return '#745bca';
+    }
+
+    /**
+     * Returns variables to overload defaults from core/css/variables.scss
+     * @return array
+     */
+    public function getScssVariables() {
+        return [
+            'color-primary' => '#745bca'
+        ];
+    }
 
 }

lib/private/legacy/defaults.php

Indentation +240 added lines, -240 removed lines

@@ -31,269 +31,269 @@
  */
 class OC_Defaults {
 
-	private $theme;
-	private $l;
+    private $theme;
+    private $l;
 
-	private $defaultEntity;
-	private $defaultName;
-	private $defaultTitle;
-	private $defaultBaseUrl;
-	private $defaultSyncClientUrl;
-	private $defaultiOSClientUrl;
-	private $defaultiTunesAppId;
-	private $defaultAndroidClientUrl;
-	private $defaultDocBaseUrl;
-	private $defaultDocVersion;
-	private $defaultSlogan;
-	private $defaultLogoClaim;
-	private $defaultMailHeaderColor;
+    private $defaultEntity;
+    private $defaultName;
+    private $defaultTitle;
+    private $defaultBaseUrl;
+    private $defaultSyncClientUrl;
+    private $defaultiOSClientUrl;
+    private $defaultiTunesAppId;
+    private $defaultAndroidClientUrl;
+    private $defaultDocBaseUrl;
+    private $defaultDocVersion;
+    private $defaultSlogan;
+    private $defaultLogoClaim;
+    private $defaultMailHeaderColor;
 
-	function __construct() {
-		$this->l = \OC::$server->getL10N('lib');
+    function __construct() {
+        $this->l = \OC::$server->getL10N('lib');
 
-		$this->defaultEntity = 'Nextcloud'; /* e.g. company name, used for footers and copyright notices */
-		$this->defaultName = 'Nextcloud'; /* short name, used when referring to the software */
-		$this->defaultTitle = 'Nextcloud'; /* can be a longer name, for titles */
-		$this->defaultBaseUrl = 'https://nextcloud.com';
-		$this->defaultSyncClientUrl = 'https://nextcloud.com/install/#install-clients';
-		$this->defaultiOSClientUrl = 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8';
-		$this->defaultiTunesAppId = '1125420102';
-		$this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.nextcloud.client';
-		$this->defaultDocBaseUrl = 'https://docs.nextcloud.com';
-		$this->defaultDocVersion = '11'; // used to generate doc links
-		$this->defaultSlogan = $this->l->t('a safe home for all your data');
-		$this->defaultLogoClaim = '';
-		$this->defaultMailHeaderColor = '#0082c9'; /* header color of mail notifications */
+        $this->defaultEntity = 'Nextcloud'; /* e.g. company name, used for footers and copyright notices */
+        $this->defaultName = 'Nextcloud'; /* short name, used when referring to the software */
+        $this->defaultTitle = 'Nextcloud'; /* can be a longer name, for titles */
+        $this->defaultBaseUrl = 'https://nextcloud.com';
+        $this->defaultSyncClientUrl = 'https://nextcloud.com/install/#install-clients';
+        $this->defaultiOSClientUrl = 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8';
+        $this->defaultiTunesAppId = '1125420102';
+        $this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.nextcloud.client';
+        $this->defaultDocBaseUrl = 'https://docs.nextcloud.com';
+        $this->defaultDocVersion = '11'; // used to generate doc links
+        $this->defaultSlogan = $this->l->t('a safe home for all your data');
+        $this->defaultLogoClaim = '';
+        $this->defaultMailHeaderColor = '#0082c9'; /* header color of mail notifications */
 
-		$themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
-		if (file_exists($themePath)) {
-			// prevent defaults.php from printing output
-			ob_start();
-			require_once $themePath;
-			ob_end_clean();
-			if (class_exists('OC_Theme')) {
-				$this->theme = new OC_Theme();
-			}
-		}
-	}
+        $themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
+        if (file_exists($themePath)) {
+            // prevent defaults.php from printing output
+            ob_start();
+            require_once $themePath;
+            ob_end_clean();
+            if (class_exists('OC_Theme')) {
+                $this->theme = new OC_Theme();
+            }
+        }
+    }
 
-	/**
-	 * @param string $method
-	 */
-	private function themeExist($method) {
-		if (isset($this->theme) && method_exists($this->theme, $method)) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * @param string $method
+     */
+    private function themeExist($method) {
+        if (isset($this->theme) && method_exists($this->theme, $method)) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * Returns the base URL
-	 * @return string URL
-	 */
-	public function getBaseUrl() {
-		if ($this->themeExist('getBaseUrl')) {
-			return $this->theme->getBaseUrl();
-		} else {
-			return $this->defaultBaseUrl;
-		}
-	}
+    /**
+     * Returns the base URL
+     * @return string URL
+     */
+    public function getBaseUrl() {
+        if ($this->themeExist('getBaseUrl')) {
+            return $this->theme->getBaseUrl();
+        } else {
+            return $this->defaultBaseUrl;
+        }
+    }
 
-	/**
-	 * Returns the URL where the sync clients are listed
-	 * @return string URL
-	 */
-	public function getSyncClientUrl() {
-		if ($this->themeExist('getSyncClientUrl')) {
-			return $this->theme->getSyncClientUrl();
-		} else {
-			return $this->defaultSyncClientUrl;
-		}
-	}
+    /**
+     * Returns the URL where the sync clients are listed
+     * @return string URL
+     */
+    public function getSyncClientUrl() {
+        if ($this->themeExist('getSyncClientUrl')) {
+            return $this->theme->getSyncClientUrl();
+        } else {
+            return $this->defaultSyncClientUrl;
+        }
+    }
 
-	/**
-	 * Returns the URL to the App Store for the iOS Client
-	 * @return string URL
-	 */
-	public function getiOSClientUrl() {
-		if ($this->themeExist('getiOSClientUrl')) {
-			return $this->theme->getiOSClientUrl();
-		} else {
-			return $this->defaultiOSClientUrl;
-		}
-	}
+    /**
+     * Returns the URL to the App Store for the iOS Client
+     * @return string URL
+     */
+    public function getiOSClientUrl() {
+        if ($this->themeExist('getiOSClientUrl')) {
+            return $this->theme->getiOSClientUrl();
+        } else {
+            return $this->defaultiOSClientUrl;
+        }
+    }
 
-	/**
-	 * Returns the AppId for the App Store for the iOS Client
-	 * @return string AppId
-	 */
-	public function getiTunesAppId() {
-		if ($this->themeExist('getiTunesAppId')) {
-			return $this->theme->getiTunesAppId();
-		} else {
-			return $this->defaultiTunesAppId;
-		}
-	}
+    /**
+     * Returns the AppId for the App Store for the iOS Client
+     * @return string AppId
+     */
+    public function getiTunesAppId() {
+        if ($this->themeExist('getiTunesAppId')) {
+            return $this->theme->getiTunesAppId();
+        } else {
+            return $this->defaultiTunesAppId;
+        }
+    }
 
-	/**
-	 * Returns the URL to Google Play for the Android Client
-	 * @return string URL
-	 */
-	public function getAndroidClientUrl() {
-		if ($this->themeExist('getAndroidClientUrl')) {
-			return $this->theme->getAndroidClientUrl();
-		} else {
-			return $this->defaultAndroidClientUrl;
-		}
-	}
+    /**
+     * Returns the URL to Google Play for the Android Client
+     * @return string URL
+     */
+    public function getAndroidClientUrl() {
+        if ($this->themeExist('getAndroidClientUrl')) {
+            return $this->theme->getAndroidClientUrl();
+        } else {
+            return $this->defaultAndroidClientUrl;
+        }
+    }
 
-	/**
-	 * Returns the documentation URL
-	 * @return string URL
-	 */
-	public function getDocBaseUrl() {
-		if ($this->themeExist('getDocBaseUrl')) {
-			return $this->theme->getDocBaseUrl();
-		} else {
-			return $this->defaultDocBaseUrl;
-		}
-	}
+    /**
+     * Returns the documentation URL
+     * @return string URL
+     */
+    public function getDocBaseUrl() {
+        if ($this->themeExist('getDocBaseUrl')) {
+            return $this->theme->getDocBaseUrl();
+        } else {
+            return $this->defaultDocBaseUrl;
+        }
+    }
 
-	/**
-	 * Returns the title
-	 * @return string title
-	 */
-	public function getTitle() {
-		if ($this->themeExist('getTitle')) {
-			return $this->theme->getTitle();
-		} else {
-			return $this->defaultTitle;
-		}
-	}
+    /**
+     * Returns the title
+     * @return string title
+     */
+    public function getTitle() {
+        if ($this->themeExist('getTitle')) {
+            return $this->theme->getTitle();
+        } else {
+            return $this->defaultTitle;
+        }
+    }
 
-	/**
-	 * Returns the short name of the software
-	 * @return string title
-	 */
-	public function getName() {
-		if ($this->themeExist('getName')) {
-			return $this->theme->getName();
-		} else {
-			return $this->defaultName;
-		}
-	}
+    /**
+     * Returns the short name of the software
+     * @return string title
+     */
+    public function getName() {
+        if ($this->themeExist('getName')) {
+            return $this->theme->getName();
+        } else {
+            return $this->defaultName;
+        }
+    }
 
-	/**
-	 * Returns the short name of the software containing HTML strings
-	 * @return string title
-	 */
-	public function getHTMLName() {
-		if ($this->themeExist('getHTMLName')) {
-			return $this->theme->getHTMLName();
-		} else {
-			return $this->defaultName;
-		}
-	}
+    /**
+     * Returns the short name of the software containing HTML strings
+     * @return string title
+     */
+    public function getHTMLName() {
+        if ($this->themeExist('getHTMLName')) {
+            return $this->theme->getHTMLName();
+        } else {
+            return $this->defaultName;
+        }
+    }
 
-	/**
-	 * Returns entity (e.g. company name) - used for footer, copyright
-	 * @return string entity name
-	 */
-	public function getEntity() {
-		if ($this->themeExist('getEntity')) {
-			return $this->theme->getEntity();
-		} else {
-			return $this->defaultEntity;
-		}
-	}
+    /**
+     * Returns entity (e.g. company name) - used for footer, copyright
+     * @return string entity name
+     */
+    public function getEntity() {
+        if ($this->themeExist('getEntity')) {
+            return $this->theme->getEntity();
+        } else {
+            return $this->defaultEntity;
+        }
+    }
 
-	/**
-	 * Returns slogan
-	 * @return string slogan
-	 */
-	public function getSlogan() {
-		if ($this->themeExist('getSlogan')) {
-			return $this->theme->getSlogan();
-		} else {
-			return $this->defaultSlogan;
-		}
-	}
+    /**
+     * Returns slogan
+     * @return string slogan
+     */
+    public function getSlogan() {
+        if ($this->themeExist('getSlogan')) {
+            return $this->theme->getSlogan();
+        } else {
+            return $this->defaultSlogan;
+        }
+    }
 
-	/**
-	 * Returns logo claim
-	 * @return string logo claim
-	 */
-	public function getLogoClaim() {
-		if ($this->themeExist('getLogoClaim')) {
-			return $this->theme->getLogoClaim();
-		} else {
-			return $this->defaultLogoClaim;
-		}
-	}
+    /**
+     * Returns logo claim
+     * @return string logo claim
+     */
+    public function getLogoClaim() {
+        if ($this->themeExist('getLogoClaim')) {
+            return $this->theme->getLogoClaim();
+        } else {
+            return $this->defaultLogoClaim;
+        }
+    }
 
-	/**
-	 * Returns short version of the footer
-	 * @return string short footer
-	 */
-	public function getShortFooter() {
-		if ($this->themeExist('getShortFooter')) {
-			$footer = $this->theme->getShortFooter();
-		} else {
-			$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-				' rel="noreferrer">' .$this->getEntity() . '</a>'.
-				' – ' . $this->getSlogan();
-		}
+    /**
+     * Returns short version of the footer
+     * @return string short footer
+     */
+    public function getShortFooter() {
+        if ($this->themeExist('getShortFooter')) {
+            $footer = $this->theme->getShortFooter();
+        } else {
+            $footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
+                ' rel="noreferrer">' .$this->getEntity() . '</a>'.
+                ' – ' . $this->getSlogan();
+        }
 
-		return $footer;
-	}
+        return $footer;
+    }
 
-	/**
-	 * Returns long version of the footer
-	 * @return string long footer
-	 */
-	public function getLongFooter() {
-		if ($this->themeExist('getLongFooter')) {
-			$footer = $this->theme->getLongFooter();
-		} else {
-			$footer = $this->getShortFooter();
-		}
+    /**
+     * Returns long version of the footer
+     * @return string long footer
+     */
+    public function getLongFooter() {
+        if ($this->themeExist('getLongFooter')) {
+            $footer = $this->theme->getLongFooter();
+        } else {
+            $footer = $this->getShortFooter();
+        }
 
-		return $footer;
-	}
+        return $footer;
+    }
 
-	/**
-	 * @param string $key
-	 */
-	public function buildDocLinkToKey($key) {
-		if ($this->themeExist('buildDocLinkToKey')) {
-			return $this->theme->buildDocLinkToKey($key);
-		}
-		return $this->getDocBaseUrl() . '/server/' . $this->defaultDocVersion . '/go.php?to=' . $key;
-	}
+    /**
+     * @param string $key
+     */
+    public function buildDocLinkToKey($key) {
+        if ($this->themeExist('buildDocLinkToKey')) {
+            return $this->theme->buildDocLinkToKey($key);
+        }
+        return $this->getDocBaseUrl() . '/server/' . $this->defaultDocVersion . '/go.php?to=' . $key;
+    }
 
-	/**
-	 * Returns mail header color
-	 * @return string
-	 */
-	public function getMailHeaderColor() {
-		if ($this->themeExist('getMailHeaderColor')) {
-			return $this->theme->getMailHeaderColor();
-		} else {
-			return $this->defaultMailHeaderColor;
-		}
-	}
+    /**
+     * Returns mail header color
+     * @return string
+     */
+    public function getMailHeaderColor() {
+        if ($this->themeExist('getMailHeaderColor')) {
+            return $this->theme->getMailHeaderColor();
+        } else {
+            return $this->defaultMailHeaderColor;
+        }
+    }
 
-	/**
-	 * @return array scss variables to overwrite
-	 */
-	public function getScssVariables() {
-		if($this->themeExist('getScssVariables')) {
-			return $this->theme->getScssVariables();
-		}
-		return [];
-	}
+    /**
+     * @return array scss variables to overwrite
+     */
+    public function getScssVariables() {
+        if($this->themeExist('getScssVariables')) {
+            return $this->theme->getScssVariables();
+        }
+        return [];
+    }
 
-	public function shouldReplaceIcons() {
-		return false;
-	}
+    public function shouldReplaceIcons() {
+        return false;
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -65,7 +65,7 @@ 
 		$this->defaultLogoClaim = '';
 		$this->defaultMailHeaderColor = '#0082c9'; /* header color of mail notifications */
 
-		$themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
+		$themePath = OC::$SERVERROOT.'/themes/'.OC_Util::getTheme().'/defaults.php';
 		if (file_exists($themePath)) {
 			// prevent defaults.php from printing output
 			ob_start();
@@ -239,9 +239,9 @@ 
 		if ($this->themeExist('getShortFooter')) {
 			$footer = $this->theme->getShortFooter();
 		} else {
-			$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-				' rel="noreferrer">' .$this->getEntity() . '</a>'.
-				' – ' . $this->getSlogan();
+			$footer = '<a href="'.$this->getBaseUrl().'" target="_blank"'.
+				' rel="noreferrer">'.$this->getEntity().'</a>'.
+				' – '.$this->getSlogan();
 		}
 
 		return $footer;
@@ -268,7 +268,7 @@ 
 		if ($this->themeExist('buildDocLinkToKey')) {
 			return $this->theme->buildDocLinkToKey($key);
 		}
-		return $this->getDocBaseUrl() . '/server/' . $this->defaultDocVersion . '/go.php?to=' . $key;
+		return $this->getDocBaseUrl().'/server/'.$this->defaultDocVersion.'/go.php?to='.$key;
 	}
 
 	/**
@@ -287,7 +287,7 @@ 
 	 * @return array scss variables to overwrite
 	 */
 	public function getScssVariables() {
-		if($this->themeExist('getScssVariables')) {
+		if ($this->themeExist('getScssVariables')) {
 			return $this->theme->getScssVariables();
 		}
 		return [];

lib/private/Server.php

Unused Use Statements -1 removed lines

@@ -95,7 +95,6 @@
 use OC\Tagging\TagMapper;
 use OC\Template\SCSSCacher;
 use OCA\Theming\ThemingDefaults;
-
 use OCP\App\IAppManager;
 use OCA\Theming\Util;
 use OCP\Federation\ICloudIdManager;

Indentation +1594 added lines, -1594 removed lines

@@ -119,1603 +119,1603 @@
  * 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->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
-		$this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class);
-
-		$this->registerService(\OCP\IPreview::class, function (Server $c) {
-			return new PreviewManager(
-				$c->getConfig(),
-				$c->getRootFolder(),
-				$c->getAppDataDir('preview'),
-				$c->getEventDispatcher(),
-				$c->getSession()->get('user_id')
-			);
-		});
-		$this->registerAlias('PreviewManager', \OCP\IPreview::class);
-
-		$this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
-			return new \OC\Preview\Watcher(
-				$c->getAppDataDir('preview')
-			);
-		});
-
-		$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(\OCP\ITagManager::class, function (Server $c) {
-			$tagMapper = $c->query('TagMapper');
-			return new TagManager($tagMapper, $c->getUserSession());
-		});
-		$this->registerAlias('TagManager', \OCP\ITagManager::class);
-
-		$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(\OCP\SystemTag\ISystemTagManager::class, function (Server $c) {
-			return $c->query('SystemTagManagerFactory')->getManager();
-		});
-		$this->registerAlias('SystemTagManager', \OCP\SystemTag\ISystemTagManager::class);
-
-		$this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function (Server $c) {
-			return $c->query('SystemTagManagerFactory')->getObjectMapper();
-		});
-		$this->registerService('RootFolder', function (Server $c) {
-			$manager = \OC\Files\Filesystem::getMountManager(null);
-			$view = new View();
-			$root = new Root(
-				$manager,
-				$view,
-				null,
-				$c->getUserMountCache(),
-				$this->getLogger(),
-				$this->getUserManager()
-			);
-			$connector = new HookConnector($root, $view);
-			$connector->viewToNode();
-
-			$previewConnector = new \OC\Preview\WatcherConnector($root, $c->getSystemConfig());
-			$previewConnector->connectWatcher();
-
-			return $root;
-		});
-		$this->registerAlias('SystemTagObjectMapper', \OCP\SystemTag\ISystemTagObjectMapper::class);
-
-		$this->registerService(\OCP\Files\IRootFolder::class, function(Server $c) {
-			return new LazyRoot(function() use ($c) {
-				return $c->query('RootFolder');
-			});
-		});
-		$this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class);
-
-		$this->registerService(\OCP\IUserManager::class, function (Server $c) {
-			$config = $c->getConfig();
-			return new \OC\User\Manager($config);
-		});
-		$this->registerAlias('UserManager', \OCP\IUserManager::class);
-
-		$this->registerService(\OCP\IGroupManager::class, function (Server $c) {
-			$groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger());
-			$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->registerAlias('GroupManager', \OCP\IGroupManager::class);
-
-		$this->registerService(Store::class, function(Server $c) {
-			$session = $c->getSession();
-			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
-				$tokenProvider = $c->query('OC\Authentication\Token\IProvider');
-			} else {
-				$tokenProvider = null;
-			}
-			$logger = $c->getLogger();
-			return new Store($session, $logger, $tokenProvider);
-		});
-		$this->registerAlias(IStore::class, Store::class);
-		$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(\OCP\IUserSession::class, 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(), $c->getSecureRandom());
-			$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->registerAlias('UserSession', \OCP\IUserSession::class);
-
-		$this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) {
-			return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig(), $c->getActivityManager(), $c->getLogger());
-		});
-
-		$this->registerAlias(\OCP\INavigationManager::class, \OC\NavigationManager::class);
-		$this->registerAlias('NavigationManager', \OCP\INavigationManager::class);
-
-		$this->registerService(\OC\AllConfig::class, function (Server $c) {
-			return new \OC\AllConfig(
-				$c->getSystemConfig()
-			);
-		});
-		$this->registerAlias('AllConfig', \OC\AllConfig::class);
-		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
-
-		$this->registerService('SystemConfig', function ($c) use ($config) {
-			return new \OC\SystemConfig($config);
-		});
-
-		$this->registerService(\OC\AppConfig::class, function (Server $c) {
-			return new \OC\AppConfig($c->getDatabaseConnection());
-		});
-		$this->registerAlias('AppConfig', \OC\AppConfig::class);
-		$this->registerAlias(\OCP\IAppConfig::class, \OC\AppConfig::class);
-
-		$this->registerService(\OCP\L10N\IFactory::class, function (Server $c) {
-			return new \OC\L10N\Factory(
-				$c->getConfig(),
-				$c->getRequest(),
-				$c->getUserSession(),
-				\OC::$SERVERROOT
-			);
-		});
-		$this->registerAlias('L10NFactory', \OCP\L10N\IFactory::class);
-
-		$this->registerService(\OCP\IURLGenerator::class, function (Server $c) {
-			$config = $c->getConfig();
-			$cacheFactory = $c->getMemCacheFactory();
-			return new \OC\URLGenerator(
-				$config,
-				$cacheFactory
-			);
-		});
-		$this->registerAlias('URLGenerator', \OCP\IURLGenerator::class);
-
-		$this->registerService('AppHelper', function ($c) {
-			return new \OC\AppHelper();
-		});
-		$this->registerService('AppFetcher', function ($c) {
-			return new AppFetcher(
-				$this->getAppDataDir('appstore'),
-				$this->getHTTPClientService(),
-				$this->query(TimeFactory::class),
-				$this->getConfig()
-			);
-		});
-		$this->registerService('CategoryFetcher', function ($c) {
-			return new CategoryFetcher(
-				$this->getAppDataDir('appstore'),
-				$this->getHTTPClientService(),
-				$this->query(TimeFactory::class),
-				$this->getConfig()
-			);
-		});
-
-		$this->registerService(\OCP\ICache::class, function ($c) {
-			return new Cache\File();
-		});
-		$this->registerAlias('UserCache', \OCP\ICache::class);
-
-		$this->registerService(Factory::class, 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 . '-' . \OC::$WEBROOT);
-				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->registerAlias('MemCacheFactory', Factory::class);
-		$this->registerAlias(ICacheFactory::class, Factory::class);
-
-		$this->registerService('RedisFactory', function (Server $c) {
-			$systemConfig = $c->getSystemConfig();
-			return new RedisFactory($systemConfig);
-		});
-
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
-			return new \OC\Activity\Manager(
-				$c->getRequest(),
-				$c->getUserSession(),
-				$c->getConfig(),
-				$c->query(IValidator::class)
-			);
-		});
-		$this->registerAlias('ActivityManager', \OCP\Activity\IManager::class);
-
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
-			return new \OC\Activity\EventMerger(
-				$c->getL10N('lib')
-			);
-		});
-		$this->registerAlias(IValidator::class, Validator::class);
-
-		$this->registerService(\OCP\IAvatarManager::class, function (Server $c) {
-			return new AvatarManager(
-				$c->getUserManager(),
-				$c->getAppDataDir('avatar'),
-				$c->getL10N('lib'),
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-		$this->registerAlias('AvatarManager', \OCP\IAvatarManager::class);
-
-		$this->registerService(\OCP\ILogger::class, function (Server $c) {
-			$logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
-			$logger = Log::getLogClass($logType);
-			call_user_func(array($logger, 'init'));
-
-			return new Log($logger);
-		});
-		$this->registerAlias('Logger', \OCP\ILogger::class);
-
-		$this->registerService(\OCP\BackgroundJob\IJobList::class, function (Server $c) {
-			$config = $c->getConfig();
-			return new \OC\BackgroundJob\JobList(
-				$c->getDatabaseConnection(),
-				$config,
-				new TimeFactory()
-			);
-		});
-		$this->registerAlias('JobList', \OCP\BackgroundJob\IJobList::class);
-
-		$this->registerService(\OCP\Route\IRouter::class, 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->registerAlias('Router', \OCP\Route\IRouter::class);
-
-		$this->registerService(\OCP\ISearch::class, function ($c) {
-			return new Search();
-		});
-		$this->registerAlias('Search', \OCP\ISearch::class);
-
-		$this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
-			return new SecureRandom();
-		});
-		$this->registerAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
-
-		$this->registerService(\OCP\Security\ICrypto::class, function (Server $c) {
-			return new Crypto($c->getConfig(), $c->getSecureRandom());
-		});
-		$this->registerAlias('Crypto', \OCP\Security\ICrypto::class);
-
-		$this->registerService(\OCP\Security\IHasher::class, function (Server $c) {
-			return new Hasher($c->getConfig());
-		});
-		$this->registerAlias('Hasher', \OCP\Security\IHasher::class);
-
-		$this->registerService(\OCP\Security\ICredentialsManager::class, function (Server $c) {
-			return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
-		});
-		$this->registerAlias('CredentialsManager', \OCP\Security\ICredentialsManager::class);
-
-		$this->registerService(IDBConnection::class, function (Server $c) {
-			$systemConfig = $c->getSystemConfig();
-			$factory = new \OC\DB\ConnectionFactory($systemConfig);
-			$type = $systemConfig->getValue('dbtype', 'sqlite');
-			if (!$factory->isValidType($type)) {
-				throw new \OC\DatabaseException('Invalid database type');
-			}
-			$connectionParams = $factory->createConnectionParams();
-			$connection = $factory->getConnection($type, $connectionParams);
-			$connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
-			return $connection;
-		});
-		$this->registerAlias('DatabaseConnection', IDBConnection::class);
-
-		$this->registerService('HTTPHelper', function (Server $c) {
-			$config = $c->getConfig();
-			return new HTTPHelper(
-				$config,
-				$c->getHTTPClientService()
-			);
-		});
-
-		$this->registerService(\OCP\Http\Client\IClientService::class, 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(), $c->getLogger())
-			);
-		});
-		$this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
-
-		$this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
-			if ($c->getSystemConfig()->getValue('debug', false)) {
-				return new EventLogger();
-			} else {
-				return new NullEventLogger();
-			}
-		});
-		$this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
-
-		$this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
-			if ($c->getSystemConfig()->getValue('debug', false)) {
-				return new QueryLogger();
-			} else {
-				return new NullQueryLogger();
-			}
-		});
-		$this->registerAlias('QueryLogger', \OCP\Diagnostics\IQueryLogger::class);
-
-		$this->registerService(TempManager::class, function (Server $c) {
-			return new TempManager(
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-		$this->registerAlias('TempManager', TempManager::class);
-		$this->registerAlias(ITempManager::class, TempManager::class);
-
-		$this->registerService(AppManager::class, function (Server $c) {
-			return new \OC\App\AppManager(
-				$c->getUserSession(),
-				$c->getAppConfig(),
-				$c->getGroupManager(),
-				$c->getMemCacheFactory(),
-				$c->getEventDispatcher()
-			);
-		});
-		$this->registerAlias('AppManager', AppManager::class);
-		$this->registerAlias(IAppManager::class, AppManager::class);
-
-		$this->registerService(\OCP\IDateTimeZone::class, function (Server $c) {
-			return new DateTimeZone(
-				$c->getConfig(),
-				$c->getSession()
-			);
-		});
-		$this->registerAlias('DateTimeZone', \OCP\IDateTimeZone::class);
-
-		$this->registerService(\OCP\IDateTimeFormatter::class, 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->registerAlias('DateTimeFormatter', \OCP\IDateTimeFormatter::class);
-
-		$this->registerService(\OCP\Files\Config\IUserMountCache::class, function (Server $c) {
-			$mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
-			$listener = new UserMountCacheListener($mountCache);
-			$listener->listen($c->getUserManager());
-			return $mountCache;
-		});
-		$this->registerAlias('UserMountCache', \OCP\Files\Config\IUserMountCache::class);
-
-		$this->registerService(\OCP\Files\Config\IMountProviderCollection::class, 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->registerAlias('MountConfigManager', \OCP\Files\Config\IMountProviderCollection::class);
-
-		$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(\OCP\IRequest::class, 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->registerAlias('Request', \OCP\IRequest::class);
-
-		$this->registerService(\OCP\Mail\IMailer::class, function (Server $c) {
-			return new Mailer(
-				$c->getConfig(),
-				$c->getLogger(),
-				$c->getThemingDefaults()
-			);
-		});
-		$this->registerAlias('Mailer', \OCP\Mail\IMailer::class);
-
-		$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(\OCP\Files\Mount\IMountManager::class, function () {
-			return new \OC\Files\Mount\Manager();
-		});
-		$this->registerAlias('MountManager', \OCP\Files\Mount\IMountManager::class);
-
-		$this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) {
-			return new \OC\Files\Type\Detection(
-				$c->getURLGenerator(),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-		$this->registerAlias('MimeTypeDetector', \OCP\Files\IMimeTypeDetector::class);
-
-		$this->registerService(\OCP\Files\IMimeTypeLoader::class, function (Server $c) {
-			return new \OC\Files\Type\Loader(
-				$c->getDatabaseConnection()
-			);
-		});
-		$this->registerAlias('MimeTypeLoader', \OCP\Files\IMimeTypeLoader::class);
-
-		$this->registerService(\OCP\Notification\IManager::class, function (Server $c) {
-			return new Manager(
-				$c->query(IValidator::class)
-			);
-		});
-		$this->registerAlias('NotificationManager', \OCP\Notification\IManager::class);
-
-		$this->registerService(\OC\CapabilitiesManager::class, function (Server $c) {
-			$manager = new \OC\CapabilitiesManager($c->getLogger());
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->getConfig());
-			});
-			return $manager;
-		});
-		$this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class);
-
-		$this->registerService(\OCP\Comments\ICommentsManager::class, 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->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class);
-
-		$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->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+        $this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class);
+
+        $this->registerService(\OCP\IPreview::class, function (Server $c) {
+            return new PreviewManager(
+                $c->getConfig(),
+                $c->getRootFolder(),
+                $c->getAppDataDir('preview'),
+                $c->getEventDispatcher(),
+                $c->getSession()->get('user_id')
+            );
+        });
+        $this->registerAlias('PreviewManager', \OCP\IPreview::class);
+
+        $this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
+            return new \OC\Preview\Watcher(
+                $c->getAppDataDir('preview')
+            );
+        });
+
+        $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(\OCP\ITagManager::class, function (Server $c) {
+            $tagMapper = $c->query('TagMapper');
+            return new TagManager($tagMapper, $c->getUserSession());
+        });
+        $this->registerAlias('TagManager', \OCP\ITagManager::class);
+
+        $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(\OCP\SystemTag\ISystemTagManager::class, function (Server $c) {
+            return $c->query('SystemTagManagerFactory')->getManager();
+        });
+        $this->registerAlias('SystemTagManager', \OCP\SystemTag\ISystemTagManager::class);
+
+        $this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function (Server $c) {
+            return $c->query('SystemTagManagerFactory')->getObjectMapper();
+        });
+        $this->registerService('RootFolder', function (Server $c) {
+            $manager = \OC\Files\Filesystem::getMountManager(null);
+            $view = new View();
+            $root = new Root(
+                $manager,
+                $view,
+                null,
+                $c->getUserMountCache(),
+                $this->getLogger(),
+                $this->getUserManager()
+            );
+            $connector = new HookConnector($root, $view);
+            $connector->viewToNode();
+
+            $previewConnector = new \OC\Preview\WatcherConnector($root, $c->getSystemConfig());
+            $previewConnector->connectWatcher();
+
+            return $root;
+        });
+        $this->registerAlias('SystemTagObjectMapper', \OCP\SystemTag\ISystemTagObjectMapper::class);
+
+        $this->registerService(\OCP\Files\IRootFolder::class, function(Server $c) {
+            return new LazyRoot(function() use ($c) {
+                return $c->query('RootFolder');
+            });
+        });
+        $this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class);
+
+        $this->registerService(\OCP\IUserManager::class, function (Server $c) {
+            $config = $c->getConfig();
+            return new \OC\User\Manager($config);
+        });
+        $this->registerAlias('UserManager', \OCP\IUserManager::class);
+
+        $this->registerService(\OCP\IGroupManager::class, function (Server $c) {
+            $groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger());
+            $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->registerAlias('GroupManager', \OCP\IGroupManager::class);
+
+        $this->registerService(Store::class, function(Server $c) {
+            $session = $c->getSession();
+            if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
+                $tokenProvider = $c->query('OC\Authentication\Token\IProvider');
+            } else {
+                $tokenProvider = null;
+            }
+            $logger = $c->getLogger();
+            return new Store($session, $logger, $tokenProvider);
+        });
+        $this->registerAlias(IStore::class, Store::class);
+        $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(\OCP\IUserSession::class, 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(), $c->getSecureRandom());
+            $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->registerAlias('UserSession', \OCP\IUserSession::class);
+
+        $this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) {
+            return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig(), $c->getActivityManager(), $c->getLogger());
+        });
+
+        $this->registerAlias(\OCP\INavigationManager::class, \OC\NavigationManager::class);
+        $this->registerAlias('NavigationManager', \OCP\INavigationManager::class);
+
+        $this->registerService(\OC\AllConfig::class, function (Server $c) {
+            return new \OC\AllConfig(
+                $c->getSystemConfig()
+            );
+        });
+        $this->registerAlias('AllConfig', \OC\AllConfig::class);
+        $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
+
+        $this->registerService('SystemConfig', function ($c) use ($config) {
+            return new \OC\SystemConfig($config);
+        });
+
+        $this->registerService(\OC\AppConfig::class, function (Server $c) {
+            return new \OC\AppConfig($c->getDatabaseConnection());
+        });
+        $this->registerAlias('AppConfig', \OC\AppConfig::class);
+        $this->registerAlias(\OCP\IAppConfig::class, \OC\AppConfig::class);
+
+        $this->registerService(\OCP\L10N\IFactory::class, function (Server $c) {
+            return new \OC\L10N\Factory(
+                $c->getConfig(),
+                $c->getRequest(),
+                $c->getUserSession(),
+                \OC::$SERVERROOT
+            );
+        });
+        $this->registerAlias('L10NFactory', \OCP\L10N\IFactory::class);
+
+        $this->registerService(\OCP\IURLGenerator::class, function (Server $c) {
+            $config = $c->getConfig();
+            $cacheFactory = $c->getMemCacheFactory();
+            return new \OC\URLGenerator(
+                $config,
+                $cacheFactory
+            );
+        });
+        $this->registerAlias('URLGenerator', \OCP\IURLGenerator::class);
+
+        $this->registerService('AppHelper', function ($c) {
+            return new \OC\AppHelper();
+        });
+        $this->registerService('AppFetcher', function ($c) {
+            return new AppFetcher(
+                $this->getAppDataDir('appstore'),
+                $this->getHTTPClientService(),
+                $this->query(TimeFactory::class),
+                $this->getConfig()
+            );
+        });
+        $this->registerService('CategoryFetcher', function ($c) {
+            return new CategoryFetcher(
+                $this->getAppDataDir('appstore'),
+                $this->getHTTPClientService(),
+                $this->query(TimeFactory::class),
+                $this->getConfig()
+            );
+        });
+
+        $this->registerService(\OCP\ICache::class, function ($c) {
+            return new Cache\File();
+        });
+        $this->registerAlias('UserCache', \OCP\ICache::class);
+
+        $this->registerService(Factory::class, 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 . '-' . \OC::$WEBROOT);
+                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->registerAlias('MemCacheFactory', Factory::class);
+        $this->registerAlias(ICacheFactory::class, Factory::class);
+
+        $this->registerService('RedisFactory', function (Server $c) {
+            $systemConfig = $c->getSystemConfig();
+            return new RedisFactory($systemConfig);
+        });
+
+        $this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+            return new \OC\Activity\Manager(
+                $c->getRequest(),
+                $c->getUserSession(),
+                $c->getConfig(),
+                $c->query(IValidator::class)
+            );
+        });
+        $this->registerAlias('ActivityManager', \OCP\Activity\IManager::class);
+
+        $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+            return new \OC\Activity\EventMerger(
+                $c->getL10N('lib')
+            );
+        });
+        $this->registerAlias(IValidator::class, Validator::class);
+
+        $this->registerService(\OCP\IAvatarManager::class, function (Server $c) {
+            return new AvatarManager(
+                $c->getUserManager(),
+                $c->getAppDataDir('avatar'),
+                $c->getL10N('lib'),
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+        $this->registerAlias('AvatarManager', \OCP\IAvatarManager::class);
+
+        $this->registerService(\OCP\ILogger::class, function (Server $c) {
+            $logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
+            $logger = Log::getLogClass($logType);
+            call_user_func(array($logger, 'init'));
+
+            return new Log($logger);
+        });
+        $this->registerAlias('Logger', \OCP\ILogger::class);
+
+        $this->registerService(\OCP\BackgroundJob\IJobList::class, function (Server $c) {
+            $config = $c->getConfig();
+            return new \OC\BackgroundJob\JobList(
+                $c->getDatabaseConnection(),
+                $config,
+                new TimeFactory()
+            );
+        });
+        $this->registerAlias('JobList', \OCP\BackgroundJob\IJobList::class);
+
+        $this->registerService(\OCP\Route\IRouter::class, 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->registerAlias('Router', \OCP\Route\IRouter::class);
+
+        $this->registerService(\OCP\ISearch::class, function ($c) {
+            return new Search();
+        });
+        $this->registerAlias('Search', \OCP\ISearch::class);
+
+        $this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
+            return new SecureRandom();
+        });
+        $this->registerAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
+
+        $this->registerService(\OCP\Security\ICrypto::class, function (Server $c) {
+            return new Crypto($c->getConfig(), $c->getSecureRandom());
+        });
+        $this->registerAlias('Crypto', \OCP\Security\ICrypto::class);
+
+        $this->registerService(\OCP\Security\IHasher::class, function (Server $c) {
+            return new Hasher($c->getConfig());
+        });
+        $this->registerAlias('Hasher', \OCP\Security\IHasher::class);
+
+        $this->registerService(\OCP\Security\ICredentialsManager::class, function (Server $c) {
+            return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
+        });
+        $this->registerAlias('CredentialsManager', \OCP\Security\ICredentialsManager::class);
+
+        $this->registerService(IDBConnection::class, function (Server $c) {
+            $systemConfig = $c->getSystemConfig();
+            $factory = new \OC\DB\ConnectionFactory($systemConfig);
+            $type = $systemConfig->getValue('dbtype', 'sqlite');
+            if (!$factory->isValidType($type)) {
+                throw new \OC\DatabaseException('Invalid database type');
+            }
+            $connectionParams = $factory->createConnectionParams();
+            $connection = $factory->getConnection($type, $connectionParams);
+            $connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
+            return $connection;
+        });
+        $this->registerAlias('DatabaseConnection', IDBConnection::class);
+
+        $this->registerService('HTTPHelper', function (Server $c) {
+            $config = $c->getConfig();
+            return new HTTPHelper(
+                $config,
+                $c->getHTTPClientService()
+            );
+        });
+
+        $this->registerService(\OCP\Http\Client\IClientService::class, 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(), $c->getLogger())
+            );
+        });
+        $this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
+
+        $this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
+            if ($c->getSystemConfig()->getValue('debug', false)) {
+                return new EventLogger();
+            } else {
+                return new NullEventLogger();
+            }
+        });
+        $this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
+
+        $this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
+            if ($c->getSystemConfig()->getValue('debug', false)) {
+                return new QueryLogger();
+            } else {
+                return new NullQueryLogger();
+            }
+        });
+        $this->registerAlias('QueryLogger', \OCP\Diagnostics\IQueryLogger::class);
+
+        $this->registerService(TempManager::class, function (Server $c) {
+            return new TempManager(
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+        $this->registerAlias('TempManager', TempManager::class);
+        $this->registerAlias(ITempManager::class, TempManager::class);
+
+        $this->registerService(AppManager::class, function (Server $c) {
+            return new \OC\App\AppManager(
+                $c->getUserSession(),
+                $c->getAppConfig(),
+                $c->getGroupManager(),
+                $c->getMemCacheFactory(),
+                $c->getEventDispatcher()
+            );
+        });
+        $this->registerAlias('AppManager', AppManager::class);
+        $this->registerAlias(IAppManager::class, AppManager::class);
+
+        $this->registerService(\OCP\IDateTimeZone::class, function (Server $c) {
+            return new DateTimeZone(
+                $c->getConfig(),
+                $c->getSession()
+            );
+        });
+        $this->registerAlias('DateTimeZone', \OCP\IDateTimeZone::class);
+
+        $this->registerService(\OCP\IDateTimeFormatter::class, 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->registerAlias('DateTimeFormatter', \OCP\IDateTimeFormatter::class);
+
+        $this->registerService(\OCP\Files\Config\IUserMountCache::class, function (Server $c) {
+            $mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
+            $listener = new UserMountCacheListener($mountCache);
+            $listener->listen($c->getUserManager());
+            return $mountCache;
+        });
+        $this->registerAlias('UserMountCache', \OCP\Files\Config\IUserMountCache::class);
+
+        $this->registerService(\OCP\Files\Config\IMountProviderCollection::class, 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->registerAlias('MountConfigManager', \OCP\Files\Config\IMountProviderCollection::class);
+
+        $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(\OCP\IRequest::class, 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->registerAlias('Request', \OCP\IRequest::class);
+
+        $this->registerService(\OCP\Mail\IMailer::class, function (Server $c) {
+            return new Mailer(
+                $c->getConfig(),
+                $c->getLogger(),
+                $c->getThemingDefaults()
+            );
+        });
+        $this->registerAlias('Mailer', \OCP\Mail\IMailer::class);
+
+        $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(\OCP\Files\Mount\IMountManager::class, function () {
+            return new \OC\Files\Mount\Manager();
+        });
+        $this->registerAlias('MountManager', \OCP\Files\Mount\IMountManager::class);
+
+        $this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) {
+            return new \OC\Files\Type\Detection(
+                $c->getURLGenerator(),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+        $this->registerAlias('MimeTypeDetector', \OCP\Files\IMimeTypeDetector::class);
+
+        $this->registerService(\OCP\Files\IMimeTypeLoader::class, function (Server $c) {
+            return new \OC\Files\Type\Loader(
+                $c->getDatabaseConnection()
+            );
+        });
+        $this->registerAlias('MimeTypeLoader', \OCP\Files\IMimeTypeLoader::class);
+
+        $this->registerService(\OCP\Notification\IManager::class, function (Server $c) {
+            return new Manager(
+                $c->query(IValidator::class)
+            );
+        });
+        $this->registerAlias('NotificationManager', \OCP\Notification\IManager::class);
+
+        $this->registerService(\OC\CapabilitiesManager::class, function (Server $c) {
+            $manager = new \OC\CapabilitiesManager($c->getLogger());
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->getConfig());
+            });
+            return $manager;
+        });
+        $this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class);
+
+        $this->registerService(\OCP\Comments\ICommentsManager::class, 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->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class);
+
+        $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 && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming')) {
-				return new ThemingDefaults(
-					$c->getConfig(),
-					$c->getL10N('theming'),
-					$c->getURLGenerator(),
-					new \OC_Defaults(),
-					$c->getAppDataDir('theming'),
-					$c->getMemCacheFactory(),
-					new Util($c->getConfig(), $this->getRootFolder(), $this->getAppManager())
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(SCSSCacher::class, function(Server $c) {
-			/** @var Factory $cacheFactory */
-			$cacheFactory = $c->query(Factory::class);
-			return new SCSSCacher(
-				$c->getLogger(),
-				$c->query(\OC\Files\AppData\Factory::class),
-				$c->getURLGenerator(),
-				$c->getConfig(),
-				$c->getThemingDefaults(),
-				\OC::$SERVERROOT,
-				$cacheFactory->createLocal('SCSS')
-
-			);
-		});
-		$this->registerService(EventDispatcher::class, function () {
-			return new EventDispatcher();
-		});
-		$this->registerAlias('EventDispatcher', EventDispatcher::class);
-		$this->registerAlias(EventDispatcherInterface::class, EventDispatcher::class);
-
-		$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());
-
-			return new CsrfTokenManager(
-				$tokenGenerator,
-				$c->query(SessionStorage::class)
-			);
-		});
-		$this->registerService(SessionStorage::class, function (Server $c) {
-			return new SessionStorage($c->getSession());
-		});
-		$this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) {
-			return new ContentSecurityPolicyManager();
-		});
-		$this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
-
-		$this->registerService('ContentSecurityPolicyNonceManager', function(Server $c) {
-			return new ContentSecurityPolicyNonceManager(
-				$c->getCsrfTokenManager(),
-				$c->getRequest()
-			);
-		});
-
-		$this->registerService(\OCP\Share\IManager::class, 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->registerAlias('ShareManager', \OCP\Share\IManager::class);
-
-		$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(),
-				$c->getRequest(),
-				new \OC\Settings\Mapper($c->getDatabaseConnection()),
-				$c->getURLGenerator()
-			);
-			return $manager;
-		});
-		$this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
-			return new \OC\Files\AppData\Factory(
-				$c->getRootFolder(),
-				$c->getSystemConfig()
-			);
-		});
-
-		$this->registerService('LockdownManager', function (Server $c) {
-			return new LockdownManager();
-		});
-
-		$this->registerService(ICloudIdManager::class, function (Server $c) {
-			return new CloudIdManager();
-		});
-
-		/* To trick DI since we don't extend the DIContainer here */
-		$this->registerService(CleanPreviewsBackgroundJob::class, function (Server $c) {
-			return new CleanPreviewsBackgroundJob(
-				$c->getRootFolder(),
-				$c->getLogger(),
-				$c->getJobList(),
-				new TimeFactory()
-			);
-		});
-
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
-		$this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
-
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		$this->registerAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
-
-		$this->registerService(\OCP\ISession::class, function(SimpleContainer $c) {
-			return $c->query(\OCP\IUserSession::class)->getSession();
-		});
-	}
-
-	/**
-	 * @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('LazyRootFolder');
-	}
-
-	/**
-	 * 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
-	 * @deprecated since 9.2.0 use IAppData
-	 */
-	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) {
-		$this->query(SessionStorage::class)->setSession($session);
-		$this->query('UserSession')->setSession($session);
-		$this->query(Store::class)->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');
-	}
-
-	/**
-	 * @return AppFetcher
-	 */
-	public function getAppFetcher() {
-		return $this->query('AppFetcher');
-	}
-
-	/**
-	 * 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 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(), $this->getLogger());
-	}
-
-	/**
-	 * 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');
-	}
-
-	/**
-	 * @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');
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->query('ContentSecurityPolicyNonceManager');
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\BackendService
-	 */
-	public function getStoragesBackendService() {
-		return $this->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 $this->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 $this->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 $this->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');
-	}
-
-	/**
-	 * @return \OCP\Files\IAppData
-	 */
-	public function getAppDataDir($app) {
-		/** @var \OC\Files\AppData\Factory $factory */
-		$factory = $this->query(\OC\Files\AppData\Factory::class);
-		return $factory->get($app);
-	}
-
-	/**
-	 * @return \OCP\Lockdown\ILockdownManager
-	 */
-	public function getLockdownManager() {
-		return $this->query('LockdownManager');
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 */
-	public function getCloudIdManager() {
-		return $this->query(ICloudIdManager::class);
-	}
+            $prefixes = \OC::$composerAutoloader->getPrefixesPsr4();
+            if (isset($prefixes['OCA\\Theming\\'])) {
+                $classExists = true;
+            } else {
+                $classExists = false;
+            }
+
+            if ($classExists && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming')) {
+                return new ThemingDefaults(
+                    $c->getConfig(),
+                    $c->getL10N('theming'),
+                    $c->getURLGenerator(),
+                    new \OC_Defaults(),
+                    $c->getAppDataDir('theming'),
+                    $c->getMemCacheFactory(),
+                    new Util($c->getConfig(), $this->getRootFolder(), $this->getAppManager())
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(SCSSCacher::class, function(Server $c) {
+            /** @var Factory $cacheFactory */
+            $cacheFactory = $c->query(Factory::class);
+            return new SCSSCacher(
+                $c->getLogger(),
+                $c->query(\OC\Files\AppData\Factory::class),
+                $c->getURLGenerator(),
+                $c->getConfig(),
+                $c->getThemingDefaults(),
+                \OC::$SERVERROOT,
+                $cacheFactory->createLocal('SCSS')
+
+            );
+        });
+        $this->registerService(EventDispatcher::class, function () {
+            return new EventDispatcher();
+        });
+        $this->registerAlias('EventDispatcher', EventDispatcher::class);
+        $this->registerAlias(EventDispatcherInterface::class, EventDispatcher::class);
+
+        $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());
+
+            return new CsrfTokenManager(
+                $tokenGenerator,
+                $c->query(SessionStorage::class)
+            );
+        });
+        $this->registerService(SessionStorage::class, function (Server $c) {
+            return new SessionStorage($c->getSession());
+        });
+        $this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) {
+            return new ContentSecurityPolicyManager();
+        });
+        $this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
+
+        $this->registerService('ContentSecurityPolicyNonceManager', function(Server $c) {
+            return new ContentSecurityPolicyNonceManager(
+                $c->getCsrfTokenManager(),
+                $c->getRequest()
+            );
+        });
+
+        $this->registerService(\OCP\Share\IManager::class, 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->registerAlias('ShareManager', \OCP\Share\IManager::class);
+
+        $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(),
+                $c->getRequest(),
+                new \OC\Settings\Mapper($c->getDatabaseConnection()),
+                $c->getURLGenerator()
+            );
+            return $manager;
+        });
+        $this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
+            return new \OC\Files\AppData\Factory(
+                $c->getRootFolder(),
+                $c->getSystemConfig()
+            );
+        });
+
+        $this->registerService('LockdownManager', function (Server $c) {
+            return new LockdownManager();
+        });
+
+        $this->registerService(ICloudIdManager::class, function (Server $c) {
+            return new CloudIdManager();
+        });
+
+        /* To trick DI since we don't extend the DIContainer here */
+        $this->registerService(CleanPreviewsBackgroundJob::class, function (Server $c) {
+            return new CleanPreviewsBackgroundJob(
+                $c->getRootFolder(),
+                $c->getLogger(),
+                $c->getJobList(),
+                new TimeFactory()
+            );
+        });
+
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        $this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
+
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
+        $this->registerAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
+
+        $this->registerService(\OCP\ISession::class, function(SimpleContainer $c) {
+            return $c->query(\OCP\IUserSession::class)->getSession();
+        });
+    }
+
+    /**
+     * @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('LazyRootFolder');
+    }
+
+    /**
+     * 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
+     * @deprecated since 9.2.0 use IAppData
+     */
+    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) {
+        $this->query(SessionStorage::class)->setSession($session);
+        $this->query('UserSession')->setSession($session);
+        $this->query(Store::class)->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');
+    }
+
+    /**
+     * @return AppFetcher
+     */
+    public function getAppFetcher() {
+        return $this->query('AppFetcher');
+    }
+
+    /**
+     * 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 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(), $this->getLogger());
+    }
+
+    /**
+     * 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');
+    }
+
+    /**
+     * @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');
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->query('ContentSecurityPolicyNonceManager');
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\BackendService
+     */
+    public function getStoragesBackendService() {
+        return $this->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 $this->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 $this->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 $this->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');
+    }
+
+    /**
+     * @return \OCP\Files\IAppData
+     */
+    public function getAppDataDir($app) {
+        /** @var \OC\Files\AppData\Factory $factory */
+        $factory = $this->query(\OC\Files\AppData\Factory::class);
+        return $factory->get($app);
+    }
+
+    /**
+     * @return \OCP\Lockdown\ILockdownManager
+     */
+    public function getLockdownManager() {
+        return $this->query('LockdownManager');
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     */
+    public function getCloudIdManager() {
+        return $this->query(ICloudIdManager::class);
+    }
 }

Spacing +95 added lines, -95 removed lines

@@ -133,7 +133,7 @@ 
 		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
 		$this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class);
 
-		$this->registerService(\OCP\IPreview::class, function (Server $c) {
+		$this->registerService(\OCP\IPreview::class, function(Server $c) {
 			return new PreviewManager(
 				$c->getConfig(),
 				$c->getRootFolder(),
@@ -144,13 +144,13 @@ 
 		});
 		$this->registerAlias('PreviewManager', \OCP\IPreview::class);
 
-		$this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
+		$this->registerService(\OC\Preview\Watcher::class, function(Server $c) {
 			return new \OC\Preview\Watcher(
 				$c->getAppDataDir('preview')
 			);
 		});
 
-		$this->registerService('EncryptionManager', function (Server $c) {
+		$this->registerService('EncryptionManager', function(Server $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -168,7 +168,7 @@ 
 			);
 		});
 
-		$this->registerService('EncryptionFileHelper', function (Server $c) {
+		$this->registerService('EncryptionFileHelper', function(Server $c) {
 			$util = new Encryption\Util(
 				new View(),
 				$c->getUserManager(),
@@ -178,7 +178,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,
@@ -189,32 +189,32 @@ 
 
 			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(\OCP\ITagManager::class, function (Server $c) {
+		$this->registerService(\OCP\ITagManager::class, function(Server $c) {
 			$tagMapper = $c->query('TagMapper');
 			return new TagManager($tagMapper, $c->getUserSession());
 		});
 		$this->registerAlias('TagManager', \OCP\ITagManager::class);
 
-		$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(\OCP\SystemTag\ISystemTagManager::class, function (Server $c) {
+		$this->registerService(\OCP\SystemTag\ISystemTagManager::class, function(Server $c) {
 			return $c->query('SystemTagManagerFactory')->getManager();
 		});
 		$this->registerAlias('SystemTagManager', \OCP\SystemTag\ISystemTagManager::class);
 
-		$this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function (Server $c) {
+		$this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function(Server $c) {
 			return $c->query('SystemTagManagerFactory')->getObjectMapper();
 		});
-		$this->registerService('RootFolder', function (Server $c) {
+		$this->registerService('RootFolder', function(Server $c) {
 			$manager = \OC\Files\Filesystem::getMountManager(null);
 			$view = new View();
 			$root = new Root(
@@ -242,30 +242,30 @@ 
 		});
 		$this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class);
 
-		$this->registerService(\OCP\IUserManager::class, function (Server $c) {
+		$this->registerService(\OCP\IUserManager::class, function(Server $c) {
 			$config = $c->getConfig();
 			return new \OC\User\Manager($config);
 		});
 		$this->registerAlias('UserManager', \OCP\IUserManager::class);
 
-		$this->registerService(\OCP\IGroupManager::class, function (Server $c) {
+		$this->registerService(\OCP\IGroupManager::class, function(Server $c) {
 			$groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger());
-			$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()));
@@ -285,11 +285,11 @@ 
 			return new Store($session, $logger, $tokenProvider);
 		});
 		$this->registerAlias(IStore::class, Store::class);
-		$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();
@@ -299,7 +299,7 @@ 
 		});
 		$this->registerAlias('OC\Authentication\Token\IProvider', 'OC\Authentication\Token\DefaultTokenProvider');
 
-		$this->registerService(\OCP\IUserSession::class, function (Server $c) {
+		$this->registerService(\OCP\IUserSession::class, function(Server $c) {
 			$manager = $c->getUserManager();
 			$session = new \OC\Session\Memory('');
 			$timeFactory = new TimeFactory();
@@ -312,40 +312,40 @@ 
 			}
 
 			$userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig(), $c->getSecureRandom());
-			$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));
 			});
@@ -353,14 +353,14 @@ 
 		});
 		$this->registerAlias('UserSession', \OCP\IUserSession::class);
 
-		$this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) {
+		$this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function(Server $c) {
 			return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig(), $c->getActivityManager(), $c->getLogger());
 		});
 
 		$this->registerAlias(\OCP\INavigationManager::class, \OC\NavigationManager::class);
 		$this->registerAlias('NavigationManager', \OCP\INavigationManager::class);
 
-		$this->registerService(\OC\AllConfig::class, function (Server $c) {
+		$this->registerService(\OC\AllConfig::class, function(Server $c) {
 			return new \OC\AllConfig(
 				$c->getSystemConfig()
 			);
@@ -368,17 +368,17 @@ 
 		$this->registerAlias('AllConfig', \OC\AllConfig::class);
 		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
 
-		$this->registerService('SystemConfig', function ($c) use ($config) {
+		$this->registerService('SystemConfig', function($c) use ($config) {
 			return new \OC\SystemConfig($config);
 		});
 
-		$this->registerService(\OC\AppConfig::class, function (Server $c) {
+		$this->registerService(\OC\AppConfig::class, function(Server $c) {
 			return new \OC\AppConfig($c->getDatabaseConnection());
 		});
 		$this->registerAlias('AppConfig', \OC\AppConfig::class);
 		$this->registerAlias(\OCP\IAppConfig::class, \OC\AppConfig::class);
 
-		$this->registerService(\OCP\L10N\IFactory::class, function (Server $c) {
+		$this->registerService(\OCP\L10N\IFactory::class, function(Server $c) {
 			return new \OC\L10N\Factory(
 				$c->getConfig(),
 				$c->getRequest(),
@@ -388,7 +388,7 @@ 
 		});
 		$this->registerAlias('L10NFactory', \OCP\L10N\IFactory::class);
 
-		$this->registerService(\OCP\IURLGenerator::class, function (Server $c) {
+		$this->registerService(\OCP\IURLGenerator::class, function(Server $c) {
 			$config = $c->getConfig();
 			$cacheFactory = $c->getMemCacheFactory();
 			return new \OC\URLGenerator(
@@ -398,10 +398,10 @@ 
 		});
 		$this->registerAlias('URLGenerator', \OCP\IURLGenerator::class);
 
-		$this->registerService('AppHelper', function ($c) {
+		$this->registerService('AppHelper', function($c) {
 			return new \OC\AppHelper();
 		});
-		$this->registerService('AppFetcher', function ($c) {
+		$this->registerService('AppFetcher', function($c) {
 			return new AppFetcher(
 				$this->getAppDataDir('appstore'),
 				$this->getHTTPClientService(),
@@ -409,7 +409,7 @@ 
 				$this->getConfig()
 			);
 		});
-		$this->registerService('CategoryFetcher', function ($c) {
+		$this->registerService('CategoryFetcher', function($c) {
 			return new CategoryFetcher(
 				$this->getAppDataDir('appstore'),
 				$this->getHTTPClientService(),
@@ -418,21 +418,21 @@ 
 			);
 		});
 
-		$this->registerService(\OCP\ICache::class, function ($c) {
+		$this->registerService(\OCP\ICache::class, function($c) {
 			return new Cache\File();
 		});
 		$this->registerAlias('UserCache', \OCP\ICache::class);
 
-		$this->registerService(Factory::class, function (Server $c) {
+		$this->registerService(Factory::class, 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 . '-' . \OC::$WEBROOT);
+				$prefix = md5($instanceId.'-'.$version.'-'.$path.'-'.\OC::$WEBROOT);
 				return new \OC\Memcache\Factory($prefix, $c->getLogger(),
 					$config->getSystemValue('memcache.local', null),
 					$config->getSystemValue('memcache.distributed', null),
@@ -449,12 +449,12 @@ 
 		$this->registerAlias('MemCacheFactory', Factory::class);
 		$this->registerAlias(ICacheFactory::class, Factory::class);
 
-		$this->registerService('RedisFactory', function (Server $c) {
+		$this->registerService('RedisFactory', function(Server $c) {
 			$systemConfig = $c->getSystemConfig();
 			return new RedisFactory($systemConfig);
 		});
 
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IManager::class, function(Server $c) {
 			return new \OC\Activity\Manager(
 				$c->getRequest(),
 				$c->getUserSession(),
@@ -464,14 +464,14 @@ 
 		});
 		$this->registerAlias('ActivityManager', \OCP\Activity\IManager::class);
 
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IEventMerger::class, function(Server $c) {
 			return new \OC\Activity\EventMerger(
 				$c->getL10N('lib')
 			);
 		});
 		$this->registerAlias(IValidator::class, Validator::class);
 
-		$this->registerService(\OCP\IAvatarManager::class, function (Server $c) {
+		$this->registerService(\OCP\IAvatarManager::class, function(Server $c) {
 			return new AvatarManager(
 				$c->getUserManager(),
 				$c->getAppDataDir('avatar'),
@@ -482,7 +482,7 @@ 
 		});
 		$this->registerAlias('AvatarManager', \OCP\IAvatarManager::class);
 
-		$this->registerService(\OCP\ILogger::class, function (Server $c) {
+		$this->registerService(\OCP\ILogger::class, function(Server $c) {
 			$logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
 			$logger = Log::getLogClass($logType);
 			call_user_func(array($logger, 'init'));
@@ -491,7 +491,7 @@ 
 		});
 		$this->registerAlias('Logger', \OCP\ILogger::class);
 
-		$this->registerService(\OCP\BackgroundJob\IJobList::class, function (Server $c) {
+		$this->registerService(\OCP\BackgroundJob\IJobList::class, function(Server $c) {
 			$config = $c->getConfig();
 			return new \OC\BackgroundJob\JobList(
 				$c->getDatabaseConnection(),
@@ -501,7 +501,7 @@ 
 		});
 		$this->registerAlias('JobList', \OCP\BackgroundJob\IJobList::class);
 
-		$this->registerService(\OCP\Route\IRouter::class, function (Server $c) {
+		$this->registerService(\OCP\Route\IRouter::class, function(Server $c) {
 			$cacheFactory = $c->getMemCacheFactory();
 			$logger = $c->getLogger();
 			if ($cacheFactory->isAvailable()) {
@@ -513,32 +513,32 @@ 
 		});
 		$this->registerAlias('Router', \OCP\Route\IRouter::class);
 
-		$this->registerService(\OCP\ISearch::class, function ($c) {
+		$this->registerService(\OCP\ISearch::class, function($c) {
 			return new Search();
 		});
 		$this->registerAlias('Search', \OCP\ISearch::class);
 
-		$this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
+		$this->registerService(\OCP\Security\ISecureRandom::class, function($c) {
 			return new SecureRandom();
 		});
 		$this->registerAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
 
-		$this->registerService(\OCP\Security\ICrypto::class, function (Server $c) {
+		$this->registerService(\OCP\Security\ICrypto::class, function(Server $c) {
 			return new Crypto($c->getConfig(), $c->getSecureRandom());
 		});
 		$this->registerAlias('Crypto', \OCP\Security\ICrypto::class);
 
-		$this->registerService(\OCP\Security\IHasher::class, function (Server $c) {
+		$this->registerService(\OCP\Security\IHasher::class, function(Server $c) {
 			return new Hasher($c->getConfig());
 		});
 		$this->registerAlias('Hasher', \OCP\Security\IHasher::class);
 
-		$this->registerService(\OCP\Security\ICredentialsManager::class, function (Server $c) {
+		$this->registerService(\OCP\Security\ICredentialsManager::class, function(Server $c) {
 			return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
 		});
 		$this->registerAlias('CredentialsManager', \OCP\Security\ICredentialsManager::class);
 
-		$this->registerService(IDBConnection::class, function (Server $c) {
+		$this->registerService(IDBConnection::class, function(Server $c) {
 			$systemConfig = $c->getSystemConfig();
 			$factory = new \OC\DB\ConnectionFactory($systemConfig);
 			$type = $systemConfig->getValue('dbtype', 'sqlite');
@@ -552,7 +552,7 @@ 
 		});
 		$this->registerAlias('DatabaseConnection', IDBConnection::class);
 
-		$this->registerService('HTTPHelper', function (Server $c) {
+		$this->registerService('HTTPHelper', function(Server $c) {
 			$config = $c->getConfig();
 			return new HTTPHelper(
 				$config,
@@ -560,7 +560,7 @@ 
 			);
 		});
 
-		$this->registerService(\OCP\Http\Client\IClientService::class, function (Server $c) {
+		$this->registerService(\OCP\Http\Client\IClientService::class, function(Server $c) {
 			$user = \OC_User::getUser();
 			$uid = $user ? $user : null;
 			return new ClientService(
@@ -570,7 +570,7 @@ 
 		});
 		$this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
 
-		$this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
+		$this->registerService(\OCP\Diagnostics\IEventLogger::class, function(Server $c) {
 			if ($c->getSystemConfig()->getValue('debug', false)) {
 				return new EventLogger();
 			} else {
@@ -579,7 +579,7 @@ 
 		});
 		$this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
 
-		$this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
+		$this->registerService(\OCP\Diagnostics\IQueryLogger::class, function(Server $c) {
 			if ($c->getSystemConfig()->getValue('debug', false)) {
 				return new QueryLogger();
 			} else {
@@ -588,7 +588,7 @@ 
 		});
 		$this->registerAlias('QueryLogger', \OCP\Diagnostics\IQueryLogger::class);
 
-		$this->registerService(TempManager::class, function (Server $c) {
+		$this->registerService(TempManager::class, function(Server $c) {
 			return new TempManager(
 				$c->getLogger(),
 				$c->getConfig()
@@ -597,7 +597,7 @@ 
 		$this->registerAlias('TempManager', TempManager::class);
 		$this->registerAlias(ITempManager::class, TempManager::class);
 
-		$this->registerService(AppManager::class, function (Server $c) {
+		$this->registerService(AppManager::class, function(Server $c) {
 			return new \OC\App\AppManager(
 				$c->getUserSession(),
 				$c->getAppConfig(),
@@ -609,7 +609,7 @@ 
 		$this->registerAlias('AppManager', AppManager::class);
 		$this->registerAlias(IAppManager::class, AppManager::class);
 
-		$this->registerService(\OCP\IDateTimeZone::class, function (Server $c) {
+		$this->registerService(\OCP\IDateTimeZone::class, function(Server $c) {
 			return new DateTimeZone(
 				$c->getConfig(),
 				$c->getSession()
@@ -617,7 +617,7 @@ 
 		});
 		$this->registerAlias('DateTimeZone', \OCP\IDateTimeZone::class);
 
-		$this->registerService(\OCP\IDateTimeFormatter::class, function (Server $c) {
+		$this->registerService(\OCP\IDateTimeFormatter::class, function(Server $c) {
 			$language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
 
 			return new DateTimeFormatter(
@@ -627,7 +627,7 @@ 
 		});
 		$this->registerAlias('DateTimeFormatter', \OCP\IDateTimeFormatter::class);
 
-		$this->registerService(\OCP\Files\Config\IUserMountCache::class, function (Server $c) {
+		$this->registerService(\OCP\Files\Config\IUserMountCache::class, function(Server $c) {
 			$mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
 			$listener = new UserMountCacheListener($mountCache);
 			$listener->listen($c->getUserManager());
@@ -635,10 +635,10 @@ 
 		});
 		$this->registerAlias('UserMountCache', \OCP\Files\Config\IUserMountCache::class);
 
-		$this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function (Server $c) {
+		$this->registerService(\OCP\Files\Config\IMountProviderCollection::class, 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
 
@@ -651,14 +651,14 @@ 
 		});
 		$this->registerAlias('MountConfigManager', \OCP\Files\Config\IMountProviderCollection::class);
 
-		$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) {
@@ -669,10 +669,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 {
@@ -690,7 +690,7 @@ 
 					$c->getTempManager()
 			);
 		});
-		$this->registerService(\OCP\IRequest::class, function ($c) {
+		$this->registerService(\OCP\IRequest::class, function($c) {
 			if (isset($this['urlParams'])) {
 				$urlParams = $this['urlParams'];
 			} else {
@@ -726,7 +726,7 @@ 
 		});
 		$this->registerAlias('Request', \OCP\IRequest::class);
 
-		$this->registerService(\OCP\Mail\IMailer::class, function (Server $c) {
+		$this->registerService(\OCP\Mail\IMailer::class, function(Server $c) {
 			return new Mailer(
 				$c->getConfig(),
 				$c->getLogger(),
@@ -738,14 +738,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')));
@@ -761,37 +761,37 @@ 
 			return new NoopLockingProvider();
 		});
 
-		$this->registerService(\OCP\Files\Mount\IMountManager::class, function () {
+		$this->registerService(\OCP\Files\Mount\IMountManager::class, function() {
 			return new \OC\Files\Mount\Manager();
 		});
 		$this->registerAlias('MountManager', \OCP\Files\Mount\IMountManager::class);
 
-		$this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) {
+		$this->registerService(\OCP\Files\IMimeTypeDetector::class, function(Server $c) {
 			return new \OC\Files\Type\Detection(
 				$c->getURLGenerator(),
 				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
+				\OC::$SERVERROOT.'/resources/config/'
 			);
 		});
 		$this->registerAlias('MimeTypeDetector', \OCP\Files\IMimeTypeDetector::class);
 
-		$this->registerService(\OCP\Files\IMimeTypeLoader::class, function (Server $c) {
+		$this->registerService(\OCP\Files\IMimeTypeLoader::class, function(Server $c) {
 			return new \OC\Files\Type\Loader(
 				$c->getDatabaseConnection()
 			);
 		});
 		$this->registerAlias('MimeTypeLoader', \OCP\Files\IMimeTypeLoader::class);
 
-		$this->registerService(\OCP\Notification\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Notification\IManager::class, function(Server $c) {
 			return new Manager(
 				$c->query(IValidator::class)
 			);
 		});
 		$this->registerAlias('NotificationManager', \OCP\Notification\IManager::class);
 
-		$this->registerService(\OC\CapabilitiesManager::class, function (Server $c) {
+		$this->registerService(\OC\CapabilitiesManager::class, function(Server $c) {
 			$manager = new \OC\CapabilitiesManager($c->getLogger());
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return new \OC\OCS\CoreCapabilities($c->getConfig());
 			});
 			return $manager;
@@ -848,13 +848,13 @@ 
 
 			);
 		});
-		$this->registerService(EventDispatcher::class, function () {
+		$this->registerService(EventDispatcher::class, function() {
 			return new EventDispatcher();
 		});
 		$this->registerAlias('EventDispatcher', EventDispatcher::class);
 		$this->registerAlias(EventDispatcherInterface::class, EventDispatcher::class);
 
-		$this->registerService('CryptoWrapper', function (Server $c) {
+		$this->registerService('CryptoWrapper', function(Server $c) {
 			// FIXME: Instantiiated here due to cyclic dependency
 			$request = new Request(
 				[
@@ -879,7 +879,7 @@ 
 				$request
 			);
 		});
-		$this->registerService('CsrfTokenManager', function (Server $c) {
+		$this->registerService('CsrfTokenManager', function(Server $c) {
 			$tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
 
 			return new CsrfTokenManager(
@@ -887,10 +887,10 @@ 
 				$c->query(SessionStorage::class)
 			);
 		});
-		$this->registerService(SessionStorage::class, function (Server $c) {
+		$this->registerService(SessionStorage::class, function(Server $c) {
 			return new SessionStorage($c->getSession());
 		});
-		$this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) {
+		$this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function(Server $c) {
 			return new ContentSecurityPolicyManager();
 		});
 		$this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
@@ -941,23 +941,23 @@ 
 			);
 			return $manager;
 		});
-		$this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
+		$this->registerService(\OC\Files\AppData\Factory::class, function(Server $c) {
 			return new \OC\Files\AppData\Factory(
 				$c->getRootFolder(),
 				$c->getSystemConfig()
 			);
 		});
 
-		$this->registerService('LockdownManager', function (Server $c) {
+		$this->registerService('LockdownManager', function(Server $c) {
 			return new LockdownManager();
 		});
 
-		$this->registerService(ICloudIdManager::class, function (Server $c) {
+		$this->registerService(ICloudIdManager::class, function(Server $c) {
 			return new CloudIdManager();
 		});
 
 		/* To trick DI since we don't extend the DIContainer here */
-		$this->registerService(CleanPreviewsBackgroundJob::class, function (Server $c) {
+		$this->registerService(CleanPreviewsBackgroundJob::class, function(Server $c) {
 			return new CleanPreviewsBackgroundJob(
 				$c->getRootFolder(),
 				$c->getLogger(),
@@ -1111,7 +1111,7 @@ 
 	 * @deprecated since 9.2.0 use IAppData
 	 */
 	public function getAppFolder() {
-		$dir = '/' . \OC_App::getCurrentApp();
+		$dir = '/'.\OC_App::getCurrentApp();
 		$root = $this->getRootFolder();
 		if (!$root->nodeExists($dir)) {
 			$folder = $root->newFolder($dir);

lib/private/Template/SCSSCacher.php

Doc Comments +2 added lines, -2 removed lines

@@ -114,8 +114,8 @@
 	}
 
 	/**
-	 * @param $appName
-	 * @param $fileName
+	 * @param string $appName
+	 * @param string $fileName
 	 * @return ISimpleFile
 	 */
 	public function getCachedCSS($appName, $fileName) {

Unused Use Statements -1 removed lines

@@ -25,7 +25,6 @@
 use Leafo\ScssPhp\Exception\ParserException;
 use Leafo\ScssPhp\Formatter\Crunched;
 use Leafo\ScssPhp\Formatter\Expanded;
-
 use OC\Files\AppData\Factory;
 use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;

Indentation +247 added lines, -247 removed lines

@@ -39,251 +39,251 @@
 
 class SCSSCacher {
 
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var IAppData */
-	protected $appData;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var string */
-	protected $serverRoot;
-
-	/** @var ICache */
-	protected $depsCache;
-
-	/**
-	 * @param ILogger $logger
-	 * @param Factory $appDataFactory
-	 * @param IURLGenerator $urlGenerator
-	 * @param IConfig $config
-	 * @param \OC_Defaults $defaults
-	 * @param string $serverRoot
-	 * @param ICache $depsCache
-	 */
-	public function __construct(ILogger $logger,
-								Factory $appDataFactory,
-								IURLGenerator $urlGenerator,
-								IConfig $config,
-								\OC_Defaults $defaults,
-								$serverRoot,
-								ICache $depsCache) {
-		$this->logger = $logger;
-		$this->appData = $appDataFactory->get('css');
-		$this->urlGenerator = $urlGenerator;
-		$this->config = $config;
-		$this->defaults = $defaults;
-		$this->serverRoot = $serverRoot;
-		$this->depsCache = $depsCache;
-	}
-
-	/**
-	 * Process the caching process if needed
-	 * @param string $root Root path to the nextcloud installation
-	 * @param string $file
-	 * @param string $app The app name
-	 * @return boolean
-	 */
-	public function process($root, $file, $app) {
-		$path = explode('/', $root . '/' . $file);
-
-		$fileNameSCSS = array_pop($path);
-		$fileNameCSS = str_replace('.scss', '.css', $fileNameSCSS);
-
-		$path = implode('/', $path);
-
-		$webDir = substr($path, strlen($this->serverRoot)+1);
-
-		try {
-			$folder = $this->appData->getFolder($app);
-		} catch(NotFoundException $e) {
-			// creating css appdata folder
-			$folder = $this->appData->newFolder($app);
-		}
-
-
-		if(!$this->variablesChanged() && $this->isCached($fileNameCSS, $folder)) {
-			return true;
-		}
-		return $this->cache($path, $fileNameCSS, $fileNameSCSS, $folder, $webDir);
-	}
-
-	/**
-	 * @param $appName
-	 * @param $fileName
-	 * @return ISimpleFile
-	 */
-	public function getCachedCSS($appName, $fileName) {
-		$folder = $this->appData->getFolder($appName);
-		return $folder->getFile($fileName);
-	}
-
-	/**
-	 * Check if the file is cached or not
-	 * @param string $fileNameCSS
-	 * @param ISimpleFolder $folder
-	 * @return boolean
-	 */
-	private function isCached($fileNameCSS, ISimpleFolder $folder) {
-		try {
-			$cachedFile = $folder->getFile($fileNameCSS);
-			if ($cachedFile->getSize() > 0) {
-				$depFileName = $fileNameCSS . '.deps';
-				$deps = $this->depsCache->get($folder->getName() . '-' . $depFileName);
-				if ($deps === null) {
-					$depFile = $folder->getFile($depFileName);
-					$deps = $depFile->getContent();
-					//Set to memcache for next run
-					$this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
-				}
-				$deps = json_decode($deps, true);
-
-				foreach ($deps as $file=>$mtime) {
-					if (!file_exists($file) || filemtime($file) > $mtime) {
-						return false;
-					}
-				}
-			}
-			return true;
-		} catch(NotFoundException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Check if the variables file has changed
-	 * @return bool
-	 */
-	private function variablesChanged() {
-		$injectedVariables = $this->getInjectedVariables();
-		if($this->config->getAppValue('core', 'scss.variables') !== md5($injectedVariables)) {
-			$this->resetCache();
-			$this->config->setAppValue('core', 'scss.variables', md5($injectedVariables));
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Cache the file with AppData
-	 * @param string $path
-	 * @param string $fileNameCSS
-	 * @param string $fileNameSCSS
-	 * @param ISimpleFolder $folder
-	 * @param string $webDir
-	 * @return boolean
-	 */
-	private function cache($path, $fileNameCSS, $fileNameSCSS, ISimpleFolder $folder, $webDir) {
-		$scss = new Compiler();
-		$scss->setImportPaths([
-			$path,
-			\OC::$SERVERROOT . '/core/css/',
-		]);
-		if($this->config->getSystemValue('debug')) {
-			// Debug mode
-			$scss->setFormatter(Expanded::class);
-			$scss->setLineNumberStyle(Compiler::LINE_COMMENTS);
-		} else {
-			// Compression
-			$scss->setFormatter(Crunched::class);
-		}
-
-		try {
-			$cachedfile = $folder->getFile($fileNameCSS);
-		} catch(NotFoundException $e) {
-			$cachedfile = $folder->newFile($fileNameCSS);
-		}
-
-		$depFileName = $fileNameCSS . '.deps';
-		try {
-			$depFile = $folder->getFile($depFileName);
-		} catch (NotFoundException $e) {
-			$depFile = $folder->newFile($depFileName);
-		}
-
-		// Compile
-		try {
-			$compiledScss = $scss->compile(
-				'@import "variables.scss";' .
-				$this->getInjectedVariables() .
-				'@import "'.$fileNameSCSS.'";');
-		} catch(ParserException $e) {
-			$this->logger->error($e, ['app' => 'core']);
-			return false;
-		}
-
-		try {
-			$cachedfile->putContent($this->rebaseUrls($compiledScss, $webDir));
-			$depFile->putContent(json_encode($scss->getParsedFiles()));
-			$this->logger->debug($webDir.'/'.$fileNameSCSS.' compiled and successfully cached', ['app' => 'core']);
-			return true;
-		} catch(NotPermittedException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Reset scss cache by deleting all generated css files
-	 * We need to regenerate all files when variables change
-	 */
-	private function resetCache() {
-		$appDirectory = $this->appData->getDirectoryListing();
-		if(empty($appDirectory)){
-			return;
-		}
-		foreach ($appDirectory as $folder) {
-			foreach ($folder->getDirectoryListing() as $file) {
-				if (substr($file->getName(), -3) === "css" || substr($file->getName(), -4) === "deps") {
-					$file->delete();
-				}
-			}
-		}
-	}
-
-	/**
-	 * @return string SCSS code for variables from OC_Defaults
-	 */
-	private function getInjectedVariables() {
-		$variables = '';
-		foreach ($this->defaults->getScssVariables() as $key => $value) {
-			$variables .= '$' . $key . ': ' . $value . ';';
-		}
-		return $variables;
-	}
-
-	/**
-	 * Add the correct uri prefix to make uri valid again
-	 * @param string $css
-	 * @param string $webDir
-	 * @return string
-	 */
-	private function rebaseUrls($css, $webDir) {
-		$re = '/url\([\'"]([\.\w?=\/-]*)[\'"]\)/x';
-		// OC\Route\Router:75
-		if(($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
-			$subst = 'url(\'../../'.$webDir.'/$1\')';	
-		} else {
-			$subst = 'url(\'../../../'.$webDir.'/$1\')';
-		}
-		return preg_replace($re, $subst, $css);
-	}
-
-	/**
-	 * Return the cached css file uri
-	 * @param string $appName the app name
-	 * @param string $fileName
-	 * @return string
-	 */
-	public function getCachedSCSS($appName, $fileName) {
-		$tmpfileLoc = explode('/', $fileName);
-		$fileName = array_pop($tmpfileLoc);
-		$fileName = str_replace('.scss', '.css', $fileName);
-
-		return substr($this->urlGenerator->linkToRoute('core.Css.getCss', array('fileName' => $fileName, 'appName' => $appName)), strlen(\OC::$WEBROOT) + 1);
-	}
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var IAppData */
+    protected $appData;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var string */
+    protected $serverRoot;
+
+    /** @var ICache */
+    protected $depsCache;
+
+    /**
+     * @param ILogger $logger
+     * @param Factory $appDataFactory
+     * @param IURLGenerator $urlGenerator
+     * @param IConfig $config
+     * @param \OC_Defaults $defaults
+     * @param string $serverRoot
+     * @param ICache $depsCache
+     */
+    public function __construct(ILogger $logger,
+                                Factory $appDataFactory,
+                                IURLGenerator $urlGenerator,
+                                IConfig $config,
+                                \OC_Defaults $defaults,
+                                $serverRoot,
+                                ICache $depsCache) {
+        $this->logger = $logger;
+        $this->appData = $appDataFactory->get('css');
+        $this->urlGenerator = $urlGenerator;
+        $this->config = $config;
+        $this->defaults = $defaults;
+        $this->serverRoot = $serverRoot;
+        $this->depsCache = $depsCache;
+    }
+
+    /**
+     * Process the caching process if needed
+     * @param string $root Root path to the nextcloud installation
+     * @param string $file
+     * @param string $app The app name
+     * @return boolean
+     */
+    public function process($root, $file, $app) {
+        $path = explode('/', $root . '/' . $file);
+
+        $fileNameSCSS = array_pop($path);
+        $fileNameCSS = str_replace('.scss', '.css', $fileNameSCSS);
+
+        $path = implode('/', $path);
+
+        $webDir = substr($path, strlen($this->serverRoot)+1);
+
+        try {
+            $folder = $this->appData->getFolder($app);
+        } catch(NotFoundException $e) {
+            // creating css appdata folder
+            $folder = $this->appData->newFolder($app);
+        }
+
+
+        if(!$this->variablesChanged() && $this->isCached($fileNameCSS, $folder)) {
+            return true;
+        }
+        return $this->cache($path, $fileNameCSS, $fileNameSCSS, $folder, $webDir);
+    }
+
+    /**
+     * @param $appName
+     * @param $fileName
+     * @return ISimpleFile
+     */
+    public function getCachedCSS($appName, $fileName) {
+        $folder = $this->appData->getFolder($appName);
+        return $folder->getFile($fileName);
+    }
+
+    /**
+     * Check if the file is cached or not
+     * @param string $fileNameCSS
+     * @param ISimpleFolder $folder
+     * @return boolean
+     */
+    private function isCached($fileNameCSS, ISimpleFolder $folder) {
+        try {
+            $cachedFile = $folder->getFile($fileNameCSS);
+            if ($cachedFile->getSize() > 0) {
+                $depFileName = $fileNameCSS . '.deps';
+                $deps = $this->depsCache->get($folder->getName() . '-' . $depFileName);
+                if ($deps === null) {
+                    $depFile = $folder->getFile($depFileName);
+                    $deps = $depFile->getContent();
+                    //Set to memcache for next run
+                    $this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
+                }
+                $deps = json_decode($deps, true);
+
+                foreach ($deps as $file=>$mtime) {
+                    if (!file_exists($file) || filemtime($file) > $mtime) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        } catch(NotFoundException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Check if the variables file has changed
+     * @return bool
+     */
+    private function variablesChanged() {
+        $injectedVariables = $this->getInjectedVariables();
+        if($this->config->getAppValue('core', 'scss.variables') !== md5($injectedVariables)) {
+            $this->resetCache();
+            $this->config->setAppValue('core', 'scss.variables', md5($injectedVariables));
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Cache the file with AppData
+     * @param string $path
+     * @param string $fileNameCSS
+     * @param string $fileNameSCSS
+     * @param ISimpleFolder $folder
+     * @param string $webDir
+     * @return boolean
+     */
+    private function cache($path, $fileNameCSS, $fileNameSCSS, ISimpleFolder $folder, $webDir) {
+        $scss = new Compiler();
+        $scss->setImportPaths([
+            $path,
+            \OC::$SERVERROOT . '/core/css/',
+        ]);
+        if($this->config->getSystemValue('debug')) {
+            // Debug mode
+            $scss->setFormatter(Expanded::class);
+            $scss->setLineNumberStyle(Compiler::LINE_COMMENTS);
+        } else {
+            // Compression
+            $scss->setFormatter(Crunched::class);
+        }
+
+        try {
+            $cachedfile = $folder->getFile($fileNameCSS);
+        } catch(NotFoundException $e) {
+            $cachedfile = $folder->newFile($fileNameCSS);
+        }
+
+        $depFileName = $fileNameCSS . '.deps';
+        try {
+            $depFile = $folder->getFile($depFileName);
+        } catch (NotFoundException $e) {
+            $depFile = $folder->newFile($depFileName);
+        }
+
+        // Compile
+        try {
+            $compiledScss = $scss->compile(
+                '@import "variables.scss";' .
+                $this->getInjectedVariables() .
+                '@import "'.$fileNameSCSS.'";');
+        } catch(ParserException $e) {
+            $this->logger->error($e, ['app' => 'core']);
+            return false;
+        }
+
+        try {
+            $cachedfile->putContent($this->rebaseUrls($compiledScss, $webDir));
+            $depFile->putContent(json_encode($scss->getParsedFiles()));
+            $this->logger->debug($webDir.'/'.$fileNameSCSS.' compiled and successfully cached', ['app' => 'core']);
+            return true;
+        } catch(NotPermittedException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Reset scss cache by deleting all generated css files
+     * We need to regenerate all files when variables change
+     */
+    private function resetCache() {
+        $appDirectory = $this->appData->getDirectoryListing();
+        if(empty($appDirectory)){
+            return;
+        }
+        foreach ($appDirectory as $folder) {
+            foreach ($folder->getDirectoryListing() as $file) {
+                if (substr($file->getName(), -3) === "css" || substr($file->getName(), -4) === "deps") {
+                    $file->delete();
+                }
+            }
+        }
+    }
+
+    /**
+     * @return string SCSS code for variables from OC_Defaults
+     */
+    private function getInjectedVariables() {
+        $variables = '';
+        foreach ($this->defaults->getScssVariables() as $key => $value) {
+            $variables .= '$' . $key . ': ' . $value . ';';
+        }
+        return $variables;
+    }
+
+    /**
+     * Add the correct uri prefix to make uri valid again
+     * @param string $css
+     * @param string $webDir
+     * @return string
+     */
+    private function rebaseUrls($css, $webDir) {
+        $re = '/url\([\'"]([\.\w?=\/-]*)[\'"]\)/x';
+        // OC\Route\Router:75
+        if(($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
+            $subst = 'url(\'../../'.$webDir.'/$1\')';	
+        } else {
+            $subst = 'url(\'../../../'.$webDir.'/$1\')';
+        }
+        return preg_replace($re, $subst, $css);
+    }
+
+    /**
+     * Return the cached css file uri
+     * @param string $appName the app name
+     * @param string $fileName
+     * @return string
+     */
+    public function getCachedSCSS($appName, $fileName) {
+        $tmpfileLoc = explode('/', $fileName);
+        $fileName = array_pop($tmpfileLoc);
+        $fileName = str_replace('.scss', '.css', $fileName);
+
+        return substr($this->urlGenerator->linkToRoute('core.Css.getCss', array('fileName' => $fileName, 'appName' => $appName)), strlen(\OC::$WEBROOT) + 1);
+    }
 }

Spacing +20 added lines, -20 removed lines

@@ -90,24 +90,24 @@ 
 	 * @return boolean
 	 */
 	public function process($root, $file, $app) {
-		$path = explode('/', $root . '/' . $file);
+		$path = explode('/', $root.'/'.$file);
 
 		$fileNameSCSS = array_pop($path);
 		$fileNameCSS = str_replace('.scss', '.css', $fileNameSCSS);
 
 		$path = implode('/', $path);
 
-		$webDir = substr($path, strlen($this->serverRoot)+1);
+		$webDir = substr($path, strlen($this->serverRoot) + 1);
 
 		try {
 			$folder = $this->appData->getFolder($app);
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			// creating css appdata folder
 			$folder = $this->appData->newFolder($app);
 		}
 
 
-		if(!$this->variablesChanged() && $this->isCached($fileNameCSS, $folder)) {
+		if (!$this->variablesChanged() && $this->isCached($fileNameCSS, $folder)) {
 			return true;
 		}
 		return $this->cache($path, $fileNameCSS, $fileNameSCSS, $folder, $webDir);
@@ -133,13 +133,13 @@ 
 		try {
 			$cachedFile = $folder->getFile($fileNameCSS);
 			if ($cachedFile->getSize() > 0) {
-				$depFileName = $fileNameCSS . '.deps';
-				$deps = $this->depsCache->get($folder->getName() . '-' . $depFileName);
+				$depFileName = $fileNameCSS.'.deps';
+				$deps = $this->depsCache->get($folder->getName().'-'.$depFileName);
 				if ($deps === null) {
 					$depFile = $folder->getFile($depFileName);
 					$deps = $depFile->getContent();
 					//Set to memcache for next run
-					$this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
+					$this->depsCache->set($folder->getName().'-'.$depFileName, $deps);
 				}
 				$deps = json_decode($deps, true);
 
@@ -150,7 +150,7 @@ 
 				}
 			}
 			return true;
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			return false;
 		}
 	}
@@ -161,7 +161,7 @@ 
 	 */
 	private function variablesChanged() {
 		$injectedVariables = $this->getInjectedVariables();
-		if($this->config->getAppValue('core', 'scss.variables') !== md5($injectedVariables)) {
+		if ($this->config->getAppValue('core', 'scss.variables') !== md5($injectedVariables)) {
 			$this->resetCache();
 			$this->config->setAppValue('core', 'scss.variables', md5($injectedVariables));
 			return true;
@@ -182,9 +182,9 @@ 
 		$scss = new Compiler();
 		$scss->setImportPaths([
 			$path,
-			\OC::$SERVERROOT . '/core/css/',
+			\OC::$SERVERROOT.'/core/css/',
 		]);
-		if($this->config->getSystemValue('debug')) {
+		if ($this->config->getSystemValue('debug')) {
 			// Debug mode
 			$scss->setFormatter(Expanded::class);
 			$scss->setLineNumberStyle(Compiler::LINE_COMMENTS);
@@ -195,11 +195,11 @@ 
 
 		try {
 			$cachedfile = $folder->getFile($fileNameCSS);
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			$cachedfile = $folder->newFile($fileNameCSS);
 		}
 
-		$depFileName = $fileNameCSS . '.deps';
+		$depFileName = $fileNameCSS.'.deps';
 		try {
 			$depFile = $folder->getFile($depFileName);
 		} catch (NotFoundException $e) {
@@ -209,10 +209,10 @@ 
 		// Compile
 		try {
 			$compiledScss = $scss->compile(
-				'@import "variables.scss";' .
-				$this->getInjectedVariables() .
+				'@import "variables.scss";'.
+				$this->getInjectedVariables().
 				'@import "'.$fileNameSCSS.'";');
-		} catch(ParserException $e) {
+		} catch (ParserException $e) {
 			$this->logger->error($e, ['app' => 'core']);
 			return false;
 		}
@@ -222,7 +222,7 @@ 
 			$depFile->putContent(json_encode($scss->getParsedFiles()));
 			$this->logger->debug($webDir.'/'.$fileNameSCSS.' compiled and successfully cached', ['app' => 'core']);
 			return true;
-		} catch(NotPermittedException $e) {
+		} catch (NotPermittedException $e) {
 			return false;
 		}
 	}
@@ -233,7 +233,7 @@ 
 	 */
 	private function resetCache() {
 		$appDirectory = $this->appData->getDirectoryListing();
-		if(empty($appDirectory)){
+		if (empty($appDirectory)) {
 			return;
 		}
 		foreach ($appDirectory as $folder) {
@@ -251,7 +251,7 @@ 
 	private function getInjectedVariables() {
 		$variables = '';
 		foreach ($this->defaults->getScssVariables() as $key => $value) {
-			$variables .= '$' . $key . ': ' . $value . ';';
+			$variables .= '$'.$key.': '.$value.';';
 		}
 		return $variables;
 	}
@@ -265,7 +265,7 @@ 
 	private function rebaseUrls($css, $webDir) {
 		$re = '/url\([\'"]([\.\w?=\/-]*)[\'"]\)/x';
 		// OC\Route\Router:75
-		if(($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
+		if (($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
 			$subst = 'url(\'../../'.$webDir.'/$1\')';	
 		} else {
 			$subst = 'url(\'../../../'.$webDir.'/$1\')';

apps/theming/lib/Controller/ThemingController.php

Indentation +291 added lines, -291 removed lines

@@ -56,312 +56,312 @@ 
  * @package OCA\Theming\Controller
  */
 class ThemingController extends Controller {
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var Util */
-	private $util;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var IL10N */
-	private $l10n;
-	/** @var IConfig */
-	private $config;
-	/** @var ITempManager */
-	private $tempManager;
-	/** @var IAppData */
-	private $appData;
-	/** @var SCSSCacher */
-	private $scssCacher;
+    /** @var ThemingDefaults */
+    private $themingDefaults;
+    /** @var Util */
+    private $util;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var IL10N */
+    private $l10n;
+    /** @var IConfig */
+    private $config;
+    /** @var ITempManager */
+    private $tempManager;
+    /** @var IAppData */
+    private $appData;
+    /** @var SCSSCacher */
+    private $scssCacher;
 
-	/**
-	 * ThemingController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param ThemingDefaults $themingDefaults
-	 * @param Util $util
-	 * @param ITimeFactory $timeFactory
-	 * @param IL10N $l
-	 * @param ITempManager $tempManager
-	 * @param IAppData $appData
-	 * @param SCSSCacher $scssCacher
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		IConfig $config,
-		ThemingDefaults $themingDefaults,
-		Util $util,
-		ITimeFactory $timeFactory,
-		IL10N $l,
-		ITempManager $tempManager,
-		IAppData $appData,
-		SCSSCacher $scssCacher
-	) {
-		parent::__construct($appName, $request);
+    /**
+     * ThemingController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param ThemingDefaults $themingDefaults
+     * @param Util $util
+     * @param ITimeFactory $timeFactory
+     * @param IL10N $l
+     * @param ITempManager $tempManager
+     * @param IAppData $appData
+     * @param SCSSCacher $scssCacher
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        IConfig $config,
+        ThemingDefaults $themingDefaults,
+        Util $util,
+        ITimeFactory $timeFactory,
+        IL10N $l,
+        ITempManager $tempManager,
+        IAppData $appData,
+        SCSSCacher $scssCacher
+    ) {
+        parent::__construct($appName, $request);
 
-		$this->themingDefaults = $themingDefaults;
-		$this->util = $util;
-		$this->timeFactory = $timeFactory;
-		$this->l10n = $l;
-		$this->config = $config;
-		$this->tempManager = $tempManager;
-		$this->appData = $appData;
-		$this->scssCacher = $scssCacher;
-	}
+        $this->themingDefaults = $themingDefaults;
+        $this->util = $util;
+        $this->timeFactory = $timeFactory;
+        $this->l10n = $l;
+        $this->config = $config;
+        $this->tempManager = $tempManager;
+        $this->appData = $appData;
+        $this->scssCacher = $scssCacher;
+    }
 
-	/**
-	 * @param string $setting
-	 * @param string $value
-	 * @return DataResponse
-	 * @internal param string $color
-	 */
-	public function updateStylesheet($setting, $value) {
-		$value = trim($value);
-		switch ($setting) {
-			case 'name':
-				if (strlen($value) > 250) {
-					return new DataResponse([
-						'data' => [
-							'message' => $this->l10n->t('The given name is too long'),
-						],
-						'status' => 'error'
-					]);
-				}
-				break;
-			case 'url':
-				if (strlen($value) > 500) {
-					return new DataResponse([
-						'data' => [
-							'message' => $this->l10n->t('The given web address is too long'),
-						],
-						'status' => 'error'
-					]);
-				}
-				break;
-			case 'slogan':
-				if (strlen($value) > 500) {
-					return new DataResponse([
-						'data' => [
-							'message' => $this->l10n->t('The given slogan is too long'),
-						],
-						'status' => 'error'
-					]);
-				}
-				break;
-			case 'color':
-				if (!preg_match('/^\#([0-9a-f]{3}|[0-9a-f]{6})$/i', $value)) {
-					return new DataResponse([
-						'data' => [
-							'message' => $this->l10n->t('The given color is invalid'),
-						],
-						'status' => 'error'
-					]);
-				}
-				break;
-		}
+    /**
+     * @param string $setting
+     * @param string $value
+     * @return DataResponse
+     * @internal param string $color
+     */
+    public function updateStylesheet($setting, $value) {
+        $value = trim($value);
+        switch ($setting) {
+            case 'name':
+                if (strlen($value) > 250) {
+                    return new DataResponse([
+                        'data' => [
+                            'message' => $this->l10n->t('The given name is too long'),
+                        ],
+                        'status' => 'error'
+                    ]);
+                }
+                break;
+            case 'url':
+                if (strlen($value) > 500) {
+                    return new DataResponse([
+                        'data' => [
+                            'message' => $this->l10n->t('The given web address is too long'),
+                        ],
+                        'status' => 'error'
+                    ]);
+                }
+                break;
+            case 'slogan':
+                if (strlen($value) > 500) {
+                    return new DataResponse([
+                        'data' => [
+                            'message' => $this->l10n->t('The given slogan is too long'),
+                        ],
+                        'status' => 'error'
+                    ]);
+                }
+                break;
+            case 'color':
+                if (!preg_match('/^\#([0-9a-f]{3}|[0-9a-f]{6})$/i', $value)) {
+                    return new DataResponse([
+                        'data' => [
+                            'message' => $this->l10n->t('The given color is invalid'),
+                        ],
+                        'status' => 'error'
+                    ]);
+                }
+                break;
+        }
 
-		$this->themingDefaults->set($setting, $value);
-		return new DataResponse(
-			[
-				'data' =>
-					[
-						'message' => $this->l10n->t('Saved')
-					],
-				'status' => 'success'
-			]
-		);
-	}
+        $this->themingDefaults->set($setting, $value);
+        return new DataResponse(
+            [
+                'data' =>
+                    [
+                        'message' => $this->l10n->t('Saved')
+                    ],
+                'status' => 'success'
+            ]
+        );
+    }
 
-	/**
-	 * Update the logos and background image
-	 *
-	 * @return DataResponse
-	 */
-	public function updateLogo() {
-		$newLogo = $this->request->getUploadedFile('uploadlogo');
-		$newBackgroundLogo = $this->request->getUploadedFile('upload-login-background');
-		if (empty($newLogo) && empty($newBackgroundLogo)) {
-			return new DataResponse(
-				[
-					'data' => [
-						'message' => $this->l10n->t('No file uploaded')
-					]
-				],
-				Http::STATUS_UNPROCESSABLE_ENTITY
-			);
-		}
+    /**
+     * Update the logos and background image
+     *
+     * @return DataResponse
+     */
+    public function updateLogo() {
+        $newLogo = $this->request->getUploadedFile('uploadlogo');
+        $newBackgroundLogo = $this->request->getUploadedFile('upload-login-background');
+        if (empty($newLogo) && empty($newBackgroundLogo)) {
+            return new DataResponse(
+                [
+                    'data' => [
+                        'message' => $this->l10n->t('No file uploaded')
+                    ]
+                ],
+                Http::STATUS_UNPROCESSABLE_ENTITY
+            );
+        }
 
-		$name = '';
-		try {
-			$folder = $this->appData->getFolder('images');
-		} catch (NotFoundException $e) {
-			$folder = $this->appData->newFolder('images');
-		}
+        $name = '';
+        try {
+            $folder = $this->appData->getFolder('images');
+        } catch (NotFoundException $e) {
+            $folder = $this->appData->newFolder('images');
+        }
 
-		if (!empty($newLogo)) {
-			$target = $folder->newFile('logo');
-			$target->putContent(file_get_contents($newLogo['tmp_name'], 'r'));
-			$this->themingDefaults->set('logoMime', $newLogo['type']);
-			$name = $newLogo['name'];
-		}
-		if (!empty($newBackgroundLogo)) {
-			$target = $folder->newFile('background');
-			$image = @imagecreatefromstring(file_get_contents($newBackgroundLogo['tmp_name'], 'r'));
-			if ($image === false) {
-				return new DataResponse(
-					[
-						'data' => [
-							'message' => $this->l10n->t('Unsupported image type'),
-						],
-						'status' => 'failure',
-					],
-					Http::STATUS_UNPROCESSABLE_ENTITY
-				);
-			}
+        if (!empty($newLogo)) {
+            $target = $folder->newFile('logo');
+            $target->putContent(file_get_contents($newLogo['tmp_name'], 'r'));
+            $this->themingDefaults->set('logoMime', $newLogo['type']);
+            $name = $newLogo['name'];
+        }
+        if (!empty($newBackgroundLogo)) {
+            $target = $folder->newFile('background');
+            $image = @imagecreatefromstring(file_get_contents($newBackgroundLogo['tmp_name'], 'r'));
+            if ($image === false) {
+                return new DataResponse(
+                    [
+                        'data' => [
+                            'message' => $this->l10n->t('Unsupported image type'),
+                        ],
+                        'status' => 'failure',
+                    ],
+                    Http::STATUS_UNPROCESSABLE_ENTITY
+                );
+            }
 
-			// Optimize the image since some people may upload images that will be
-			// either to big or are not progressive rendering.
-			$tmpFile = $this->tempManager->getTemporaryFile();
-			if (function_exists('imagescale')) {
-				// FIXME: Once PHP 5.5.0 is a requirement the above check can be removed
-				// Workaround for https://bugs.php.net/bug.php?id=65171
-				$newHeight = imagesy($image) / (imagesx($image) / 1920);
-				$image = imagescale($image, 1920, $newHeight);
-			}
-			imageinterlace($image, 1);
-			imagejpeg($image, $tmpFile, 75);
-			imagedestroy($image);
+            // Optimize the image since some people may upload images that will be
+            // either to big or are not progressive rendering.
+            $tmpFile = $this->tempManager->getTemporaryFile();
+            if (function_exists('imagescale')) {
+                // FIXME: Once PHP 5.5.0 is a requirement the above check can be removed
+                // Workaround for https://bugs.php.net/bug.php?id=65171
+                $newHeight = imagesy($image) / (imagesx($image) / 1920);
+                $image = imagescale($image, 1920, $newHeight);
+            }
+            imageinterlace($image, 1);
+            imagejpeg($image, $tmpFile, 75);
+            imagedestroy($image);
 
-			$target->putContent(file_get_contents($tmpFile, 'r'));
-			$this->themingDefaults->set('backgroundMime', $newBackgroundLogo['type']);
-			$name = $newBackgroundLogo['name'];
-		}
+            $target->putContent(file_get_contents($tmpFile, 'r'));
+            $this->themingDefaults->set('backgroundMime', $newBackgroundLogo['type']);
+            $name = $newBackgroundLogo['name'];
+        }
 
-		return new DataResponse(
-			[
-				'data' =>
-					[
-						'name' => $name,
-						'message' => $this->l10n->t('Saved')
-					],
-				'status' => 'success'
-			]
-		);
-	}
+        return new DataResponse(
+            [
+                'data' =>
+                    [
+                        'name' => $name,
+                        'message' => $this->l10n->t('Saved')
+                    ],
+                'status' => 'success'
+            ]
+        );
+    }
 
-	/**
-	 * Revert setting to default value
-	 *
-	 * @param string $setting setting which should be reverted
-	 * @return DataResponse
-	 */
-	public function undo($setting) {
-		$value = $this->themingDefaults->undo($setting);
-		return new DataResponse(
-			[
-				'data' =>
-					[
-						'value' => $value,
-						'message' => $this->l10n->t('Saved')
-					],
-				'status' => 'success'
-			]
-		);
-	}
+    /**
+     * Revert setting to default value
+     *
+     * @param string $setting setting which should be reverted
+     * @return DataResponse
+     */
+    public function undo($setting) {
+        $value = $this->themingDefaults->undo($setting);
+        return new DataResponse(
+            [
+                'data' =>
+                    [
+                        'value' => $value,
+                        'message' => $this->l10n->t('Saved')
+                    ],
+                'status' => 'success'
+            ]
+        );
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @return FileDisplayResponse|NotFoundResponse
-	 */
-	public function getLogo() {
-		try {
-			/** @var File $file */
-			$file = $this->appData->getFolder('images')->getFile('logo');
-		} catch (NotFoundException $e) {
-			return new NotFoundResponse();
-		}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @return FileDisplayResponse|NotFoundResponse
+     */
+    public function getLogo() {
+        try {
+            /** @var File $file */
+            $file = $this->appData->getFolder('images')->getFile('logo');
+        } catch (NotFoundException $e) {
+            return new NotFoundResponse();
+        }
 
-		$response = new FileDisplayResponse($file);
-		$response->cacheFor(3600);
-		$expires = new \DateTime();
-		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT24H'));
-		$response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
-		$response->addHeader('Pragma', 'cache');
-		$response->addHeader('Content-Type', $this->config->getAppValue($this->appName, 'logoMime', ''));
-		return $response;
-	}
+        $response = new FileDisplayResponse($file);
+        $response->cacheFor(3600);
+        $expires = new \DateTime();
+        $expires->setTimestamp($this->timeFactory->getTime());
+        $expires->add(new \DateInterval('PT24H'));
+        $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
+        $response->addHeader('Pragma', 'cache');
+        $response->addHeader('Content-Type', $this->config->getAppValue($this->appName, 'logoMime', ''));
+        return $response;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @return FileDisplayResponse|NotFoundResponse
-	 */
-	public function getLoginBackground() {
-		try {
-			/** @var File $file */
-			$file = $this->appData->getFolder('images')->getFile('background');
-		} catch (NotFoundException $e) {
-			return new NotFoundResponse();
-		}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @return FileDisplayResponse|NotFoundResponse
+     */
+    public function getLoginBackground() {
+        try {
+            /** @var File $file */
+            $file = $this->appData->getFolder('images')->getFile('background');
+        } catch (NotFoundException $e) {
+            return new NotFoundResponse();
+        }
 
-		$response = new FileDisplayResponse($file);
-		$response->cacheFor(3600);
-		$expires = new \DateTime();
-		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT24H'));
-		$response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
-		$response->addHeader('Pragma', 'cache');
-		$response->addHeader('Content-Type', $this->config->getAppValue($this->appName, 'backgroundMime', ''));
-		return $response;
-	}
+        $response = new FileDisplayResponse($file);
+        $response->cacheFor(3600);
+        $expires = new \DateTime();
+        $expires->setTimestamp($this->timeFactory->getTime());
+        $expires->add(new \DateInterval('PT24H'));
+        $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
+        $response->addHeader('Pragma', 'cache');
+        $response->addHeader('Content-Type', $this->config->getAppValue($this->appName, 'backgroundMime', ''));
+        return $response;
+    }
 
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * @return FileDisplayResponse|NotFoundResponse
-	 */
-	public function getStylesheet() {
-		$appPath = substr(\OC::$server->getAppManager()->getAppPath('theming'), strlen(\OC::$SERVERROOT) + 1);
-		/* SCSSCacher is required here
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * @return FileDisplayResponse|NotFoundResponse
+     */
+    public function getStylesheet() {
+        $appPath = substr(\OC::$server->getAppManager()->getAppPath('theming'), strlen(\OC::$SERVERROOT) + 1);
+        /* SCSSCacher is required here
 		 * We cannot rely on automatic caching done by \OC_Util::addStyle,
 		 * since we need to add the cacheBuster value to the url
 		 */
-		$cssCached = $this->scssCacher->process(\OC::$SERVERROOT, $appPath . '/css/theming.scss', 'theming');
-		if(!$cssCached) {
-			return new NotFoundResponse();
-		}
+        $cssCached = $this->scssCacher->process(\OC::$SERVERROOT, $appPath . '/css/theming.scss', 'theming');
+        if(!$cssCached) {
+            return new NotFoundResponse();
+        }
 
-		try {
-			$cssFile = $this->scssCacher->getCachedCSS('theming', 'theming.css');
-			$response = new FileDisplayResponse($cssFile, Http::STATUS_OK, ['Content-Type' => 'text/css']);
-			$response->cacheFor(86400);
-			$expires = new \DateTime();
-			$expires->setTimestamp($this->timeFactory->getTime());
-			$expires->add(new \DateInterval('PT24H'));
-			$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-			$response->addHeader('Pragma', 'cache');
-			return $response;
-		} catch (NotFoundException $e) {
-			return new NotFoundResponse();
-		}
-	}
+        try {
+            $cssFile = $this->scssCacher->getCachedCSS('theming', 'theming.css');
+            $response = new FileDisplayResponse($cssFile, Http::STATUS_OK, ['Content-Type' => 'text/css']);
+            $response->cacheFor(86400);
+            $expires = new \DateTime();
+            $expires->setTimestamp($this->timeFactory->getTime());
+            $expires->add(new \DateInterval('PT24H'));
+            $response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+            $response->addHeader('Pragma', 'cache');
+            return $response;
+        } catch (NotFoundException $e) {
+            return new NotFoundResponse();
+        }
+    }
 
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * @return DataDownloadResponse
-	 */
-	public function getJavascript() {
-		$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
-		$responseJS = '(function() {
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * @return DataDownloadResponse
+     */
+    public function getJavascript() {
+        $cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
+        $responseJS = '(function() {
 	OCA.Theming = {
 		name: ' . json_encode($this->themingDefaults->getName()) . ',
 		url: ' . json_encode($this->themingDefaults->getBaseUrl()) . ',
@@ -371,10 +371,10 @@ 
 		cacheBuster: ' . json_encode($cacheBusterValue) . '
 	};
 })();';
-		$response = new DataDownloadResponse($responseJS, 'javascript', 'text/javascript');
-		$response->addHeader('Expires', date(\DateTime::RFC2822, $this->timeFactory->getTime()));
-		$response->addHeader('Pragma', 'cache');
-		$response->cacheFor(3600);
-		return $response;
-	}
+        $response = new DataDownloadResponse($responseJS, 'javascript', 'text/javascript');
+        $response->addHeader('Expires', date(\DateTime::RFC2822, $this->timeFactory->getTime()));
+        $response->addHeader('Pragma', 'cache');
+        $response->cacheFor(3600);
+        return $response;
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -333,8 +333,8 @@ 
 		 * We cannot rely on automatic caching done by \OC_Util::addStyle,
 		 * since we need to add the cacheBuster value to the url
 		 */
-		$cssCached = $this->scssCacher->process(\OC::$SERVERROOT, $appPath . '/css/theming.scss', 'theming');
-		if(!$cssCached) {
+		$cssCached = $this->scssCacher->process(\OC::$SERVERROOT, $appPath.'/css/theming.scss', 'theming');
+		if (!$cssCached) {
 			return new NotFoundResponse();
 		}
 
@@ -363,12 +363,12 @@ 
 		$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
 		$responseJS = '(function() {
 	OCA.Theming = {
-		name: ' . json_encode($this->themingDefaults->getName()) . ',
-		url: ' . json_encode($this->themingDefaults->getBaseUrl()) . ',
-		slogan: ' . json_encode($this->themingDefaults->getSlogan()) . ',
-		color: ' . json_encode($this->themingDefaults->getMailHeaderColor()) . ',
-		inverted: ' . json_encode($this->util->invertTextColor($this->themingDefaults->getMailHeaderColor())) . ',
-		cacheBuster: ' . json_encode($cacheBusterValue) . '
+		name: ' . json_encode($this->themingDefaults->getName()).',
+		url: ' . json_encode($this->themingDefaults->getBaseUrl()).',
+		slogan: ' . json_encode($this->themingDefaults->getSlogan()).',
+		color: ' . json_encode($this->themingDefaults->getMailHeaderColor()).',
+		inverted: ' . json_encode($this->util->invertTextColor($this->themingDefaults->getMailHeaderColor())).',
+		cacheBuster: ' . json_encode($cacheBusterValue).'
 	};
 })();';
 		$response = new DataDownloadResponse($responseJS, 'javascript', 'text/javascript');

apps/theming/lib/ThemingDefaults.php

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IURLGenerator;
-use OCP\Files\IRootFolder;
 
 class ThemingDefaults extends \OC_Defaults {
 

Indentation +213 added lines, -213 removed lines

@@ -32,242 +32,242 @@
 
 class ThemingDefaults extends \OC_Defaults {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	private $l;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IAppData */
-	private $appData;
-	/** @var \OC_Defaults */
-	private $defaults;
-	/** @var ICacheFactory */
-	private $cacheFactory;
-	/** @var string */
-	private $name;
-	/** @var string */
-	private $url;
-	/** @var string */
-	private $slogan;
-	/** @var string */
-	private $color;
+    /** @var IConfig */
+    private $config;
+    /** @var IL10N */
+    private $l;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IAppData */
+    private $appData;
+    /** @var \OC_Defaults */
+    private $defaults;
+    /** @var ICacheFactory */
+    private $cacheFactory;
+    /** @var string */
+    private $name;
+    /** @var string */
+    private $url;
+    /** @var string */
+    private $slogan;
+    /** @var string */
+    private $color;
 
-	/**
-	 * ThemingDefaults constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IL10N $l
-	 * @param IURLGenerator $urlGenerator
-	 * @param \OC_Defaults $defaults
-	 * @param IAppData $appData
-	 * @param ICacheFactory $cacheFactory
-	 * @param Util $util
-	 */
-	public function __construct(IConfig $config,
-								IL10N $l,
-								IURLGenerator $urlGenerator,
-								\OC_Defaults $defaults,
-								IAppData $appData,
-								ICacheFactory $cacheFactory,
-								Util $util
-	) {
-		$this->config = $config;
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
-		$this->defaults = $defaults;
-		$this->appData = $appData;
-		$this->cacheFactory = $cacheFactory;
-		$this->util = $util;
+    /**
+     * ThemingDefaults constructor.
+     *
+     * @param IConfig $config
+     * @param IL10N $l
+     * @param IURLGenerator $urlGenerator
+     * @param \OC_Defaults $defaults
+     * @param IAppData $appData
+     * @param ICacheFactory $cacheFactory
+     * @param Util $util
+     */
+    public function __construct(IConfig $config,
+                                IL10N $l,
+                                IURLGenerator $urlGenerator,
+                                \OC_Defaults $defaults,
+                                IAppData $appData,
+                                ICacheFactory $cacheFactory,
+                                Util $util
+    ) {
+        $this->config = $config;
+        $this->l = $l;
+        $this->urlGenerator = $urlGenerator;
+        $this->defaults = $defaults;
+        $this->appData = $appData;
+        $this->cacheFactory = $cacheFactory;
+        $this->util = $util;
 
-		$this->name = $this->defaults->getName();
-		$this->url = $this->defaults->getBaseUrl();
-		$this->slogan = $this->defaults->getSlogan();
-		$this->color = $this->defaults->getMailHeaderColor();
-	}
+        $this->name = $this->defaults->getName();
+        $this->url = $this->defaults->getBaseUrl();
+        $this->slogan = $this->defaults->getSlogan();
+        $this->color = $this->defaults->getMailHeaderColor();
+    }
 
-	public function getName() {
-		return strip_tags($this->config->getAppValue('theming', 'name', $this->name));
-	}
+    public function getName() {
+        return strip_tags($this->config->getAppValue('theming', 'name', $this->name));
+    }
 
-	public function getHTMLName() {
-		return $this->config->getAppValue('theming', 'name', $this->name);
-	}
+    public function getHTMLName() {
+        return $this->config->getAppValue('theming', 'name', $this->name);
+    }
 
-	public function getTitle() {
-		return $this->getName();
-	}
+    public function getTitle() {
+        return $this->getName();
+    }
 
-	public function getEntity() {
-		return $this->getName();
-	}
+    public function getEntity() {
+        return $this->getName();
+    }
 
-	public function getBaseUrl() {
-		return $this->config->getAppValue('theming', 'url', $this->url);
-	}
+    public function getBaseUrl() {
+        return $this->config->getAppValue('theming', 'url', $this->url);
+    }
 
-	public function getSlogan() {
-		return \OCP\Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', $this->slogan));
-	}
+    public function getSlogan() {
+        return \OCP\Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', $this->slogan));
+    }
 
-	public function getShortFooter() {
-		$slogan = $this->getSlogan();
-		$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-			' rel="noreferrer">' .$this->getEntity() . '</a>'.
-			($slogan !== '' ? ' – ' . $slogan : '');
+    public function getShortFooter() {
+        $slogan = $this->getSlogan();
+        $footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
+            ' rel="noreferrer">' .$this->getEntity() . '</a>'.
+            ($slogan !== '' ? ' – ' . $slogan : '');
 
-		return $footer;
-	}
+        return $footer;
+    }
 
-	/**
-	 * Color that is used for the header as well as for mail headers
-	 *
-	 * @return string
-	 */
-	public function getMailHeaderColor() {
-		return $this->config->getAppValue('theming', 'color', $this->color);
-	}
+    /**
+     * Color that is used for the header as well as for mail headers
+     *
+     * @return string
+     */
+    public function getMailHeaderColor() {
+        return $this->config->getAppValue('theming', 'color', $this->color);
+    }
 
-	/**
-	 * Themed logo url
-	 *
-	 * @return string
-	 */
-	public function getLogo() {
-		try {
-			$file = $this->appData->getFolder('images')->getFile('logo');
-		} catch (NotFoundException $e) {
-			$file = null;
-		}
-		$logo = $this->config->getAppValue('theming', 'logoMime', false);
-		if(!$logo || $file === null) {
-			return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core','logo.svg'));
-		} else {
-			return $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLogo');
-		}
-	}
+    /**
+     * Themed logo url
+     *
+     * @return string
+     */
+    public function getLogo() {
+        try {
+            $file = $this->appData->getFolder('images')->getFile('logo');
+        } catch (NotFoundException $e) {
+            $file = null;
+        }
+        $logo = $this->config->getAppValue('theming', 'logoMime', false);
+        if(!$logo || $file === null) {
+            return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core','logo.svg'));
+        } else {
+            return $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLogo');
+        }
+    }
 
-	/**
-	 * Themed background image url
-	 *
-	 * @return string
-	 */
-	public function getBackground() {
-		try {
-			$file = $this->appData->getFolder('images')->getFile('background');
-		} catch (NotFoundException $e) {
-			$file = null;
-		}
-		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', false);
-		if(!$backgroundLogo || $file === null) {
-			return $this->urlGenerator->imagePath('core','background.jpg');
-		} else {
-			return $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLoginBackground');
-		}
-	}
+    /**
+     * Themed background image url
+     *
+     * @return string
+     */
+    public function getBackground() {
+        try {
+            $file = $this->appData->getFolder('images')->getFile('background');
+        } catch (NotFoundException $e) {
+            $file = null;
+        }
+        $backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', false);
+        if(!$backgroundLogo || $file === null) {
+            return $this->urlGenerator->imagePath('core','background.jpg');
+        } else {
+            return $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLoginBackground');
+        }
+    }
 
 
-	/**
-	 * @return array scss variables to overwrite
-	 */
-	public function getScssVariables() {
-		$cache = $this->cacheFactory->create('theming');
-		if ($value = $cache->get('getScssVariables')) {
-			return $value;
-		}
+    /**
+     * @return array scss variables to overwrite
+     */
+    public function getScssVariables() {
+        $cache = $this->cacheFactory->create('theming');
+        if ($value = $cache->get('getScssVariables')) {
+            return $value;
+        }
 
-		$variables = [
-			'theming-cachebuster' => "'" . $this->config->getAppValue('theming', 'cachebuster', '0') . "'",
-		];
+        $variables = [
+            'theming-cachebuster' => "'" . $this->config->getAppValue('theming', 'cachebuster', '0') . "'",
+        ];
 
-		$variables['image-logo'] = "'".$this->getLogo()."'";
-		$variables['image-login-background'] = "'".$this->getBackground()."'";
+        $variables['image-logo'] = "'".$this->getLogo()."'";
+        $variables['image-login-background'] = "'".$this->getBackground()."'";
 
-		if ($this->config->getAppValue('theming', 'color', null) !== null) {
-			if ($this->util->invertTextColor($this->getMailHeaderColor())) {
-				$colorPrimaryText = '#000000';
-			} else {
-				$colorPrimaryText = '#ffffff';
-			}
-			$variables['color-primary'] = $this->getMailHeaderColor();
-			$variables['color-primary-text'] = $colorPrimaryText;
-		}
-		$cache->set('getScssVariables', $variables);
-		return $variables;
-	}
+        if ($this->config->getAppValue('theming', 'color', null) !== null) {
+            if ($this->util->invertTextColor($this->getMailHeaderColor())) {
+                $colorPrimaryText = '#000000';
+            } else {
+                $colorPrimaryText = '#ffffff';
+            }
+            $variables['color-primary'] = $this->getMailHeaderColor();
+            $variables['color-primary-text'] = $colorPrimaryText;
+        }
+        $cache->set('getScssVariables', $variables);
+        return $variables;
+    }
 
-	/**
-	 * Check if Imagemagick is enabled and if SVG is supported
-	 * otherwise we can't render custom icons
-	 *
-	 * @return bool
-	 */
-	public function shouldReplaceIcons() {
-		$cache = $this->cacheFactory->create('theming');
-		if($value = $cache->get('shouldReplaceIcons')) {
-			return (bool)$value;
-		}
-		$value = false;
-		if(extension_loaded('imagick')) {
-			$checkImagick = new \Imagick();
-			if (count($checkImagick->queryFormats('SVG')) >= 1) {
-				$value = true;
-			}
-			$checkImagick->clear();
-		}
-		$cache->set('shouldReplaceIcons', $value);
-		return $value;
-	}
+    /**
+     * Check if Imagemagick is enabled and if SVG is supported
+     * otherwise we can't render custom icons
+     *
+     * @return bool
+     */
+    public function shouldReplaceIcons() {
+        $cache = $this->cacheFactory->create('theming');
+        if($value = $cache->get('shouldReplaceIcons')) {
+            return (bool)$value;
+        }
+        $value = false;
+        if(extension_loaded('imagick')) {
+            $checkImagick = new \Imagick();
+            if (count($checkImagick->queryFormats('SVG')) >= 1) {
+                $value = true;
+            }
+            $checkImagick->clear();
+        }
+        $cache->set('shouldReplaceIcons', $value);
+        return $value;
+    }
 
-	/**
-	 * Increases the cache buster key
-	 */
-	private function increaseCacheBuster() {
-		$cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
-		$this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
-		$this->cacheFactory->create('theming')->clear('getScssVariables');
-	}
+    /**
+     * Increases the cache buster key
+     */
+    private function increaseCacheBuster() {
+        $cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
+        $this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
+        $this->cacheFactory->create('theming')->clear('getScssVariables');
+    }
 
-	/**
-	 * Update setting in the database
-	 *
-	 * @param string $setting
-	 * @param string $value
-	 */
-	public function set($setting, $value) {
-		$this->config->setAppValue('theming', $setting, $value);
-		$this->increaseCacheBuster();
-	}
+    /**
+     * Update setting in the database
+     *
+     * @param string $setting
+     * @param string $value
+     */
+    public function set($setting, $value) {
+        $this->config->setAppValue('theming', $setting, $value);
+        $this->increaseCacheBuster();
+    }
 
-	/**
-	 * Revert settings to the default value
-	 *
-	 * @param string $setting setting which should be reverted
-	 * @return string default value
-	 */
-	public function undo($setting) {
-		$this->config->deleteAppValue('theming', $setting);
-		$this->increaseCacheBuster();
+    /**
+     * Revert settings to the default value
+     *
+     * @param string $setting setting which should be reverted
+     * @return string default value
+     */
+    public function undo($setting) {
+        $this->config->deleteAppValue('theming', $setting);
+        $this->increaseCacheBuster();
 
-		switch ($setting) {
-			case 'name':
-				$returnValue = $this->getEntity();
-				break;
-			case 'url':
-				$returnValue = $this->getBaseUrl();
-				break;
-			case 'slogan':
-				$returnValue = $this->getSlogan();
-				break;
-			case 'color':
-				$returnValue = $this->getMailHeaderColor();
-				break;
-			default:
-				$returnValue = '';
-				break;
-		}
+        switch ($setting) {
+            case 'name':
+                $returnValue = $this->getEntity();
+                break;
+            case 'url':
+                $returnValue = $this->getBaseUrl();
+                break;
+            case 'slogan':
+                $returnValue = $this->getSlogan();
+                break;
+            case 'color':
+                $returnValue = $this->getMailHeaderColor();
+                break;
+            default:
+                $returnValue = '';
+                break;
+        }
 
-		return $returnValue;
-	}
+        return $returnValue;
+    }
 
 }

Spacing +12 added lines, -12 removed lines

@@ -112,9 +112,9 @@ 
 
 	public function getShortFooter() {
 		$slogan = $this->getSlogan();
-		$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-			' rel="noreferrer">' .$this->getEntity() . '</a>'.
-			($slogan !== '' ? ' – ' . $slogan : '');
+		$footer = '<a href="'.$this->getBaseUrl().'" target="_blank"'.
+			' rel="noreferrer">'.$this->getEntity().'</a>'.
+			($slogan !== '' ? ' – '.$slogan : '');
 
 		return $footer;
 	}
@@ -140,8 +140,8 @@ 
 			$file = null;
 		}
 		$logo = $this->config->getAppValue('theming', 'logoMime', false);
-		if(!$logo || $file === null) {
-			return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core','logo.svg'));
+		if (!$logo || $file === null) {
+			return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'logo.svg'));
 		} else {
 			return $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLogo');
 		}
@@ -159,8 +159,8 @@ 
 			$file = null;
 		}
 		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', false);
-		if(!$backgroundLogo || $file === null) {
-			return $this->urlGenerator->imagePath('core','background.jpg');
+		if (!$backgroundLogo || $file === null) {
+			return $this->urlGenerator->imagePath('core', 'background.jpg');
 		} else {
 			return $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLoginBackground');
 		}
@@ -177,7 +177,7 @@ 
 		}
 
 		$variables = [
-			'theming-cachebuster' => "'" . $this->config->getAppValue('theming', 'cachebuster', '0') . "'",
+			'theming-cachebuster' => "'".$this->config->getAppValue('theming', 'cachebuster', '0')."'",
 		];
 
 		$variables['image-logo'] = "'".$this->getLogo()."'";
@@ -204,11 +204,11 @@ 
 	 */
 	public function shouldReplaceIcons() {
 		$cache = $this->cacheFactory->create('theming');
-		if($value = $cache->get('shouldReplaceIcons')) {
-			return (bool)$value;
+		if ($value = $cache->get('shouldReplaceIcons')) {
+			return (bool) $value;
 		}
 		$value = false;
-		if(extension_loaded('imagick')) {
+		if (extension_loaded('imagick')) {
 			$checkImagick = new \Imagick();
 			if (count($checkImagick->queryFormats('SVG')) >= 1) {
 				$value = true;
@@ -224,7 +224,7 @@ 
 	 */
 	private function increaseCacheBuster() {
 		$cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
-		$this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
+		$this->config->setAppValue('theming', 'cachebuster', (int) $cacheBusterKey + 1);
 		$this->cacheFactory->create('theming')->clear('getScssVariables');
 	}
 

lib/private/TemplateLayout.php

Spacing +30 added lines, -30 removed lines

@@ -52,46 +52,46 @@ 
 	 * @param string $renderAs
 	 * @param string $appId application id
 	 */
-	public function __construct( $renderAs, $appId = '' ) {
+	public function __construct($renderAs, $appId = '') {
 
 		// yes - should be injected ....
 		$this->config = \OC::$server->getConfig();
 
 
 		// Decide which page we show
-		if($renderAs == 'user') {
-			parent::__construct( 'core', 'layout.user' );
-			if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
+		if ($renderAs == 'user') {
+			parent::__construct('core', 'layout.user');
+			if (in_array(\OC_App::getCurrentApp(), ['settings', 'admin', 'help']) !== false) {
 				$this->assign('bodyid', 'body-settings');
-			}else{
+			} else {
 				$this->assign('bodyid', 'body-user');
 			}
 
 			// Code integrity notification
 			$integrityChecker = \OC::$server->getIntegrityCodeChecker();
-			if(\OC_User::isAdminUser(\OC_User::getUser()) && $integrityChecker->isCodeCheckEnforced() && !$integrityChecker->hasPassedCheck()) {
+			if (\OC_User::isAdminUser(\OC_User::getUser()) && $integrityChecker->isCodeCheckEnforced() && !$integrityChecker->hasPassedCheck()) {
 				\OCP\Util::addScript('core', 'integritycheck-failed-notification');
 			}
 
 			// Add navigation entry
-			$this->assign( 'application', '');
-			$this->assign( 'appid', $appId );
+			$this->assign('application', '');
+			$this->assign('appid', $appId);
 			$navigation = \OC_App::getNavigation();
-			$this->assign( 'navigation', $navigation);
+			$this->assign('navigation', $navigation);
 			$navigation = \OC_App::getHeaderNavigation();
-			$this->assign( 'headernavigation', $navigation);
+			$this->assign('headernavigation', $navigation);
 			$settingsNavigation = \OC_App::getSettingsNavigation();
-			$this->assign( 'settingsnavigation', $settingsNavigation);
-			foreach($navigation as $entry) {
+			$this->assign('settingsnavigation', $settingsNavigation);
+			foreach ($navigation as $entry) {
 				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'] );
+					$this->assign('application', $entry['name']);
 					break;
 				}
 			}
 			
-			foreach($settingsNavigation as $entry) {
+			foreach ($settingsNavigation as $entry) {
 				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'] );
+					$this->assign('application', $entry['name']);
 					break;
 				}
 			}
@@ -125,7 +125,7 @@ 
 		// Send the language to our layouts
 		$this->assign('language', \OC::$server->getL10NFactory()->findLanguage());
 
-		if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
+		if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
 			if (empty(self::$versionHash)) {
 				$v = \OC_App::getAppVersions();
 				$v['core'] = implode('.', \OCP\Util::getVersion());
@@ -156,10 +156,10 @@ 
 				$this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
 			}
 		}
-		foreach($jsFiles as $info) {
+		foreach ($jsFiles as $info) {
 			$web = $info[1];
 			$file = $info[2];
-			$this->append( 'jsfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
+			$this->append('jsfiles', $web.'/'.$file.$this->getVersionHashSuffix());
 		}
 
 		try {
@@ -170,7 +170,7 @@ 
 
 		// Do not initialise scss appdata until we have a fully installed instance
 		// Do not load scss for update, errors, installation or login page
-		if(\OC::$server->getSystemConfig()->getValue('installed', false)
+		if (\OC::$server->getSystemConfig()->getValue('installed', false)
 			&& !\OCP\Util::needUpgrade()
 			&& $pathInfo !== ''
 			&& !preg_match('/^\/login/', $pathInfo)) {
@@ -185,25 +185,25 @@ 
 		$this->assign('cssfiles', array());
 		$this->assign('printcssfiles', []);
 		$this->assign('versionHash', self::$versionHash);
-		foreach($cssFiles as $info) {
+		foreach ($cssFiles as $info) {
 			$web = $info[1];
 			$file = $info[2];
 
 			if (substr($file, -strlen('print.css')) === 'print.css') {
-				$this->append( 'printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
+				$this->append('printcssfiles', $web.'/'.$file.$this->getVersionHashSuffix());
 			} else {
-				$this->append( 'cssfiles', $web.'/'.$file . $this->getVersionHashSuffix()  );
+				$this->append('cssfiles', $web.'/'.$file.$this->getVersionHashSuffix());
 			}
 		}
 	}
 
 	protected function getVersionHashSuffix() {
-		if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
+		if (\OC::$server->getConfig()->getSystemValue('debug', false)) {
 			// allows chrome workspace mapping in debug mode
 			return "";
 		}
 
-		return '?v=' . self::$versionHash;
+		return '?v='.self::$versionHash;
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 		// Read the selected theme from the config file
 		$theme = \OC_Util::getTheme();
 
-		if($compileScss) {
+		if ($compileScss) {
 			$SCSSCacher = \OC::$server->query(SCSSCacher::class);
 		} else {
 			$SCSSCacher = null;
@@ -223,8 +223,8 @@ 
 		$locator = new \OC\Template\CSSResourceLocator(
 			\OC::$server->getLogger(),
 			$theme,
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
+			array(\OC::$SERVERROOT => \OC::$WEBROOT),
+			array(\OC::$SERVERROOT => \OC::$WEBROOT),
 			$SCSSCacher
 		);
 		$locator->find($styles);
@@ -242,8 +242,8 @@ 
 		$locator = new \OC\Template\JSResourceLocator(
 			\OC::$server->getLogger(),
 			$theme,
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
+			array(\OC::$SERVERROOT => \OC::$WEBROOT),
+			array(\OC::$SERVERROOT => \OC::$WEBROOT),
 			new JSCombiner(
 				\OC::$server->getAppDataDir('js'),
 				\OC::$server->getURLGenerator(),
@@ -263,7 +263,7 @@ 
 	 */
 	public static function convertToRelativePath($filePath) {
 		$relativePath = explode(\OC::$SERVERROOT, $filePath);
-		if(count($relativePath) !== 2) {
+		if (count($relativePath) !== 2) {
 			throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
 		}
 

Indentation +196 added lines, -196 removed lines

@@ -41,226 +41,226 @@
 
 class TemplateLayout extends \OC_Template {
 
-	private static $versionHash = '';
+    private static $versionHash = '';
 
-	/**
-	 * @var \OCP\IConfig
-	 */
-	private $config;
+    /**
+     * @var \OCP\IConfig
+     */
+    private $config;
 
-	/**
-	 * @param string $renderAs
-	 * @param string $appId application id
-	 */
-	public function __construct( $renderAs, $appId = '' ) {
+    /**
+     * @param string $renderAs
+     * @param string $appId application id
+     */
+    public function __construct( $renderAs, $appId = '' ) {
 
-		// yes - should be injected ....
-		$this->config = \OC::$server->getConfig();
+        // yes - should be injected ....
+        $this->config = \OC::$server->getConfig();
 
 
-		// Decide which page we show
-		if($renderAs == 'user') {
-			parent::__construct( 'core', 'layout.user' );
-			if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
-				$this->assign('bodyid', 'body-settings');
-			}else{
-				$this->assign('bodyid', 'body-user');
-			}
+        // Decide which page we show
+        if($renderAs == 'user') {
+            parent::__construct( 'core', 'layout.user' );
+            if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
+                $this->assign('bodyid', 'body-settings');
+            }else{
+                $this->assign('bodyid', 'body-user');
+            }
 
-			// Code integrity notification
-			$integrityChecker = \OC::$server->getIntegrityCodeChecker();
-			if(\OC_User::isAdminUser(\OC_User::getUser()) && $integrityChecker->isCodeCheckEnforced() && !$integrityChecker->hasPassedCheck()) {
-				\OCP\Util::addScript('core', 'integritycheck-failed-notification');
-			}
+            // Code integrity notification
+            $integrityChecker = \OC::$server->getIntegrityCodeChecker();
+            if(\OC_User::isAdminUser(\OC_User::getUser()) && $integrityChecker->isCodeCheckEnforced() && !$integrityChecker->hasPassedCheck()) {
+                \OCP\Util::addScript('core', 'integritycheck-failed-notification');
+            }
 
-			// Add navigation entry
-			$this->assign( 'application', '');
-			$this->assign( 'appid', $appId );
-			$navigation = \OC_App::getNavigation();
-			$this->assign( 'navigation', $navigation);
-			$navigation = \OC_App::getHeaderNavigation();
-			$this->assign( 'headernavigation', $navigation);
-			$settingsNavigation = \OC_App::getSettingsNavigation();
-			$this->assign( 'settingsnavigation', $settingsNavigation);
-			foreach($navigation as $entry) {
-				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'] );
-					break;
-				}
-			}
+            // Add navigation entry
+            $this->assign( 'application', '');
+            $this->assign( 'appid', $appId );
+            $navigation = \OC_App::getNavigation();
+            $this->assign( 'navigation', $navigation);
+            $navigation = \OC_App::getHeaderNavigation();
+            $this->assign( 'headernavigation', $navigation);
+            $settingsNavigation = \OC_App::getSettingsNavigation();
+            $this->assign( 'settingsnavigation', $settingsNavigation);
+            foreach($navigation as $entry) {
+                if ($entry['active']) {
+                    $this->assign( 'application', $entry['name'] );
+                    break;
+                }
+            }
 			
-			foreach($settingsNavigation as $entry) {
-				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'] );
-					break;
-				}
-			}
-			$userDisplayName = \OC_User::getDisplayName();
-			$this->assign('user_displayname', $userDisplayName);
-			$this->assign('user_uid', \OC_User::getUser());
+            foreach($settingsNavigation as $entry) {
+                if ($entry['active']) {
+                    $this->assign( 'application', $entry['name'] );
+                    break;
+                }
+            }
+            $userDisplayName = \OC_User::getDisplayName();
+            $this->assign('user_displayname', $userDisplayName);
+            $this->assign('user_uid', \OC_User::getUser());
 
-			if (\OC_User::getUser() === false) {
-				$this->assign('userAvatarSet', false);
-			} else {
-				$this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(\OC_User::getUser())->exists());
-				$this->assign('userAvatarVersion', \OC::$server->getConfig()->getUserValue(\OC_User::getUser(), 'avatar', 'version', 0));
-			}
+            if (\OC_User::getUser() === false) {
+                $this->assign('userAvatarSet', false);
+            } else {
+                $this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(\OC_User::getUser())->exists());
+                $this->assign('userAvatarVersion', \OC::$server->getConfig()->getUserValue(\OC_User::getUser(), 'avatar', 'version', 0));
+            }
 
-		} else if ($renderAs == 'error') {
-			parent::__construct('core', 'layout.guest', '', false);
-			$this->assign('bodyid', 'body-login');
-		} else if ($renderAs == 'guest') {
-			parent::__construct('core', 'layout.guest');
-			$this->assign('bodyid', 'body-login');
-		} else {
-			parent::__construct('core', 'layout.base');
+        } else if ($renderAs == 'error') {
+            parent::__construct('core', 'layout.guest', '', false);
+            $this->assign('bodyid', 'body-login');
+        } else if ($renderAs == 'guest') {
+            parent::__construct('core', 'layout.guest');
+            $this->assign('bodyid', 'body-login');
+        } else {
+            parent::__construct('core', 'layout.base');
 
-		}
-		// Send the language to our layouts
-		$this->assign('language', \OC::$server->getL10NFactory()->findLanguage());
+        }
+        // Send the language to our layouts
+        $this->assign('language', \OC::$server->getL10NFactory()->findLanguage());
 
-		if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
-			if (empty(self::$versionHash)) {
-				$v = \OC_App::getAppVersions();
-				$v['core'] = implode('.', \OCP\Util::getVersion());
-				self::$versionHash = md5(implode(',', $v));
-			}
-		} else {
-			self::$versionHash = md5('not installed');
-		}
+        if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
+            if (empty(self::$versionHash)) {
+                $v = \OC_App::getAppVersions();
+                $v['core'] = implode('.', \OCP\Util::getVersion());
+                self::$versionHash = md5(implode(',', $v));
+            }
+        } else {
+            self::$versionHash = md5('not installed');
+        }
 
-		// Add the js files
-		$jsFiles = self::findJavascriptFiles(\OC_Util::$scripts);
-		$this->assign('jsfiles', array());
-		if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
-			if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
-				$jsConfigHelper = new JSConfigHelper(
-					\OC::$server->getL10N('core'),
-					\OC::$server->getThemingDefaults(),
-					\OC::$server->getAppManager(),
-					\OC::$server->getSession(),
-					\OC::$server->getUserSession()->getUser(),
-					\OC::$server->getConfig(),
-					\OC::$server->getGroupManager(),
-					\OC::$server->getIniWrapper(),
-					\OC::$server->getURLGenerator()
-				);
-				$this->assign('inline_ocjs', $jsConfigHelper->getConfig());
-			} else {
-				$this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
-			}
-		}
-		foreach($jsFiles as $info) {
-			$web = $info[1];
-			$file = $info[2];
-			$this->append( 'jsfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
-		}
+        // Add the js files
+        $jsFiles = self::findJavascriptFiles(\OC_Util::$scripts);
+        $this->assign('jsfiles', array());
+        if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
+            if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
+                $jsConfigHelper = new JSConfigHelper(
+                    \OC::$server->getL10N('core'),
+                    \OC::$server->getThemingDefaults(),
+                    \OC::$server->getAppManager(),
+                    \OC::$server->getSession(),
+                    \OC::$server->getUserSession()->getUser(),
+                    \OC::$server->getConfig(),
+                    \OC::$server->getGroupManager(),
+                    \OC::$server->getIniWrapper(),
+                    \OC::$server->getURLGenerator()
+                );
+                $this->assign('inline_ocjs', $jsConfigHelper->getConfig());
+            } else {
+                $this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
+            }
+        }
+        foreach($jsFiles as $info) {
+            $web = $info[1];
+            $file = $info[2];
+            $this->append( 'jsfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
+        }
 
-		try {
-			$pathInfo = \OC::$server->getRequest()->getPathInfo();
-		} catch (\Exception $e) {
-			$pathInfo = '';
-		}
+        try {
+            $pathInfo = \OC::$server->getRequest()->getPathInfo();
+        } catch (\Exception $e) {
+            $pathInfo = '';
+        }
 
-		// Do not initialise scss appdata until we have a fully installed instance
-		// Do not load scss for update, errors, installation or login page
-		if(\OC::$server->getSystemConfig()->getValue('installed', false)
-			&& !\OCP\Util::needUpgrade()
-			&& $pathInfo !== ''
-			&& !preg_match('/^\/login/', $pathInfo)) {
-			$cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
-		} else {
-			// If we ignore the scss compiler,
-			// we need to load the guest css fallback
-			\OC_Util::addStyle('guest');
-			$cssFiles = self::findStylesheetFiles(\OC_Util::$styles, false);
-		}
+        // Do not initialise scss appdata until we have a fully installed instance
+        // Do not load scss for update, errors, installation or login page
+        if(\OC::$server->getSystemConfig()->getValue('installed', false)
+            && !\OCP\Util::needUpgrade()
+            && $pathInfo !== ''
+            && !preg_match('/^\/login/', $pathInfo)) {
+            $cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
+        } else {
+            // If we ignore the scss compiler,
+            // we need to load the guest css fallback
+            \OC_Util::addStyle('guest');
+            $cssFiles = self::findStylesheetFiles(\OC_Util::$styles, false);
+        }
 
-		$this->assign('cssfiles', array());
-		$this->assign('printcssfiles', []);
-		$this->assign('versionHash', self::$versionHash);
-		foreach($cssFiles as $info) {
-			$web = $info[1];
-			$file = $info[2];
+        $this->assign('cssfiles', array());
+        $this->assign('printcssfiles', []);
+        $this->assign('versionHash', self::$versionHash);
+        foreach($cssFiles as $info) {
+            $web = $info[1];
+            $file = $info[2];
 
-			if (substr($file, -strlen('print.css')) === 'print.css') {
-				$this->append( 'printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
-			} else {
-				$this->append( 'cssfiles', $web.'/'.$file . $this->getVersionHashSuffix()  );
-			}
-		}
-	}
+            if (substr($file, -strlen('print.css')) === 'print.css') {
+                $this->append( 'printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
+            } else {
+                $this->append( 'cssfiles', $web.'/'.$file . $this->getVersionHashSuffix()  );
+            }
+        }
+    }
 
-	protected function getVersionHashSuffix() {
-		if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
-			// allows chrome workspace mapping in debug mode
-			return "";
-		}
+    protected function getVersionHashSuffix() {
+        if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
+            // allows chrome workspace mapping in debug mode
+            return "";
+        }
 
-		return '?v=' . self::$versionHash;
-	}
+        return '?v=' . self::$versionHash;
+    }
 
-	/**
-	 * @param array $styles
-	 * @return array
-	 */
-	static public function findStylesheetFiles($styles, $compileScss = true) {
-		// Read the selected theme from the config file
-		$theme = \OC_Util::getTheme();
+    /**
+     * @param array $styles
+     * @return array
+     */
+    static public function findStylesheetFiles($styles, $compileScss = true) {
+        // Read the selected theme from the config file
+        $theme = \OC_Util::getTheme();
 
-		if($compileScss) {
-			$SCSSCacher = \OC::$server->query(SCSSCacher::class);
-		} else {
-			$SCSSCacher = null;
-		}
+        if($compileScss) {
+            $SCSSCacher = \OC::$server->query(SCSSCacher::class);
+        } else {
+            $SCSSCacher = null;
+        }
 
-		$locator = new \OC\Template\CSSResourceLocator(
-			\OC::$server->getLogger(),
-			$theme,
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
-			$SCSSCacher
-		);
-		$locator->find($styles);
-		return $locator->getResources();
-	}
+        $locator = new \OC\Template\CSSResourceLocator(
+            \OC::$server->getLogger(),
+            $theme,
+            array( \OC::$SERVERROOT => \OC::$WEBROOT ),
+            array( \OC::$SERVERROOT => \OC::$WEBROOT ),
+            $SCSSCacher
+        );
+        $locator->find($styles);
+        return $locator->getResources();
+    }
 
-	/**
-	 * @param array $scripts
-	 * @return array
-	 */
-	static public function findJavascriptFiles($scripts) {
-		// Read the selected theme from the config file
-		$theme = \OC_Util::getTheme();
+    /**
+     * @param array $scripts
+     * @return array
+     */
+    static public function findJavascriptFiles($scripts) {
+        // Read the selected theme from the config file
+        $theme = \OC_Util::getTheme();
 
-		$locator = new \OC\Template\JSResourceLocator(
-			\OC::$server->getLogger(),
-			$theme,
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
-			new JSCombiner(
-				\OC::$server->getAppDataDir('js'),
-				\OC::$server->getURLGenerator(),
-				\OC::$server->getMemCacheFactory()->create('JS'),
-				\OC::$server->getSystemConfig()
-			)
-			);
-		$locator->find($scripts);
-		return $locator->getResources();
-	}
+        $locator = new \OC\Template\JSResourceLocator(
+            \OC::$server->getLogger(),
+            $theme,
+            array( \OC::$SERVERROOT => \OC::$WEBROOT ),
+            array( \OC::$SERVERROOT => \OC::$WEBROOT ),
+            new JSCombiner(
+                \OC::$server->getAppDataDir('js'),
+                \OC::$server->getURLGenerator(),
+                \OC::$server->getMemCacheFactory()->create('JS'),
+                \OC::$server->getSystemConfig()
+            )
+            );
+        $locator->find($scripts);
+        return $locator->getResources();
+    }
 
-	/**
-	 * Converts the absolute file path to a relative path from \OC::$SERVERROOT
-	 * @param string $filePath Absolute path
-	 * @return string Relative path
-	 * @throws \Exception If $filePath is not under \OC::$SERVERROOT
-	 */
-	public static function convertToRelativePath($filePath) {
-		$relativePath = explode(\OC::$SERVERROOT, $filePath);
-		if(count($relativePath) !== 2) {
-			throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
-		}
+    /**
+     * Converts the absolute file path to a relative path from \OC::$SERVERROOT
+     * @param string $filePath Absolute path
+     * @return string Relative path
+     * @throws \Exception If $filePath is not under \OC::$SERVERROOT
+     */
+    public static function convertToRelativePath($filePath) {
+        $relativePath = explode(\OC::$SERVERROOT, $filePath);
+        if(count($relativePath) !== 2) {
+            throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
+        }
 
-		return $relativePath[1];
-	}
+        return $relativePath[1];
+    }
 }