Fixed tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

3 files changed, 15 insertions, 16 deletions

diff --git a/lib/private/Server.php b/lib/private/Server.php
index c9f8001631e..0f406ebe9b7 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -116,6 +116,7 @@ use OC\Share20\ProviderFactory;
 use OC\Share20\ShareHelper;
 use OC\SystemTag\ManagerFactory as SystemTagManagerFactory;
 use OC\Tagging\TagMapper;
+use OC\Template\IconsCacher;
 use OC\Template\JSCombiner;
 use OC\Template\SCSSCacher;
 use OCA\Theming\ImageManager;
@@ -963,7 +964,8 @@ class Server extends ServerContainer implements IServerContainer {
 				$c->getConfig(),
 				$c->getThemingDefaults(),
 				\OC::$SERVERROOT,
-				$this->getMemCacheFactory()
+				$this->getMemCacheFactory(),
+				$c->query(IconsCacher::class)
 			);
 		});
 		$this->registerService(JSCombiner::class, function (Server $c) {
diff --git a/lib/private/Template/IconsCacher.php b/lib/private/Template/IconsCacher.php
index c4d073156f1..a8dacfcfbc0 100644
--- a/lib/private/Template/IconsCacher.php
+++ b/lib/private/Template/IconsCacher.php
@@ -26,6 +26,7 @@ namespace OC\Template;
 use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFolder;
+use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\ILogger;
 use OCP\IURLGenerator;
 use OC\Files\AppData\Factory;
@@ -85,10 +86,11 @@ class IconsCacher {
 	 */
 	public function setIconsCss(string $css) {
 
-		try {
-			$currentData = $this->folder->getFile($this->fileName)->getContent();
-		} catch (NotFoundException $e) {
+		$cachedFile = $this->getCachedCSS();
+		if (!$cachedFile) {
 			$currentData = '';
+		} else {
+			$currentData = $cachedFile->getContent();
 		}
 
 		// remove :root
@@ -102,16 +104,14 @@ class IconsCacher {
 		}
 
 		if (strlen($data) > 0) {
-			try {
-				$cachedfile = $this->folder->getFile($this->fileName);
-			} catch (NotFoundException $e) {
-				$cachedfile = $this->folder->newFile($this->fileName);
+			if (!$cachedFile) {
+				$cachedFile = $this->folder->newFile($this->fileName);
 			}
 
 			$data = ":root {
 				$data
 			}";
-			$cachedfile->putContent($data);
+			$cachedFile->putContent($data);
 		}
 
 		return preg_replace($this->iconVarRE, '', $css);
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index ed1383f8ea3..269daf5556d 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -85,6 +85,7 @@ class SCSSCacher {
 	 * @param \OC_Defaults $defaults
 	 * @param string $serverRoot
 	 * @param ICacheFactory $cacheFactory
+	 * @param IconsCacher $iconsCacher
 	 */
 	public function __construct(ILogger $logger,
 								Factory $appDataFactory,
@@ -92,7 +93,8 @@ class SCSSCacher {
 								IConfig $config,
 								\OC_Defaults $defaults,
 								$serverRoot,
-								ICacheFactory $cacheFactory) {
+								ICacheFactory $cacheFactory,
+								IconsCacher $iconsCacher) {
 		$this->logger       = $logger;
 		$this->appData      = $appDataFactory->get('css');
 		$this->urlGenerator = $urlGenerator;
@@ -101,12 +103,7 @@ class SCSSCacher {
 		$this->serverRoot   = $serverRoot;
 		$this->cacheFactory = $cacheFactory;
 		$this->depsCache    = $cacheFactory->createDistributed('SCSS-' . md5($this->urlGenerator->getBaseUrl()));
-
-		$this->iconsCacher = new IconsCacher(
-			$this->logger,
-			$appDataFactory,
-			$this->urlGenerator
-		);
+		$this->iconsCacher = $iconsCacher;
 	}
 
 	/**