nextcloud / server

lib/private/Template/IconsCacher.php

Indentation +224 added lines, -224 removed lines

@@ -35,229 +35,229 @@
 
 class IconsCacher {
 
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var IAppData */
-	protected $appData;
-
-	/** @var ISimpleFolder */
-	private $folder;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var ITimeFactory */
-	protected $timeFactory;
-
-	/** @var string */
-	private $iconVarRE = '/--(icon-[a-zA-Z0-9-]+):\s?url\(["\']?([a-zA-Z0-9-_\~\/\.\?\&\=\:\;\+\,]+)[^;]+;/m';
-
-	/** @var string */
-	private $fileName = 'icons-vars.css';
-
-	private $iconList = 'icons-list.template';
-
-	private $cachedCss;
-	private $cachedList;
-
-	/**
-	 * @param ILogger $logger
-	 * @param Factory $appDataFactory
-	 * @param IURLGenerator $urlGenerator
-	 * @param ITimeFactory $timeFactory
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function __construct(ILogger $logger,
-								Factory $appDataFactory,
-								IURLGenerator $urlGenerator,
-								ITimeFactory $timeFactory) {
-		$this->logger       = $logger;
-		$this->appData      = $appDataFactory->get('css');
-		$this->urlGenerator = $urlGenerator;
-		$this->timeFactory  = $timeFactory;
-
-		try {
-			$this->folder = $this->appData->getFolder('icons');
-		} catch (NotFoundException $e) {
-			$this->folder = $this->appData->newFolder('icons');
-		}
-	}
-
-	private function getIconsFromCss(string $css): array {
-		preg_match_all($this->iconVarRE, $css, $matches, PREG_SET_ORDER);
-		$icons = [];
-		foreach ($matches as $icon) {
-			$icons[$icon[1]] = $icon[2];
-		}
-
-		return $icons;
-	}
-
-	/**
-	 * @param string $css
-	 * @return string
-	 * @throws NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function setIconsCss(string $css): string {
-
-		$cachedFile = $this->getCachedList();
-		if (!$cachedFile) {
-			$currentData = '';
-			$cachedFile = $this->folder->newFile($this->iconList);
-		} else {
-			$currentData = $cachedFile->getContent();
-		}
-
-		$cachedVarsCssFile = $this->getCachedCSS();
-		if (!$cachedVarsCssFile) {
-			$cachedVarsCssFile = $this->folder->newFile($this->fileName);
-		}
-
-		$icons = $this->getIconsFromCss($currentData . $css);
-
-		$data = '';
-		$list = '';
-		foreach ($icons as $icon => $url) {
-			$list .= "--$icon: url('$url');";
-			list($location,$color) = $this->parseUrl($url);
-			$svg = false;
-			if ($location !== '' && \file_exists($location)) {
-				$svg = \file_get_contents($location);
-			}
-			if ($svg === false) {
-				$this->logger->debug('Failed to get icon file ' . $location);
-				$data .= "--$icon: url('$url');";
-				continue;
-			}
-			$encode = base64_encode($this->colorizeSvg($svg, $color));
-			$data .= '--' . $icon . ': url(data:image/svg+xml;base64,' . $encode . ');';
-		}
-
-		if (\strlen($data) > 0 && \strlen($list) > 0) {
-			$data = ":root {\n$data\n}";
-			$cachedVarsCssFile->putContent($data);
-			$list = ":root {\n$list\n}";
-			$cachedFile->putContent($list);
-			$this->cachedList = null;
-			$this->cachedCss = null;
-		}
-
-		return preg_replace($this->iconVarRE, '', $css);
-	}
-
-	/**
-	 * @param $url
-	 * @return array
-	 */
-	private function parseUrl($url): array {
-		$location = '';
-		$color = '';
-		$base = $this->getRoutePrefix() . '/svg/';
-		$cleanUrl = \substr($url, \strlen($base));
-		if (\strpos($url, $base . 'core') === 0) {
-			$cleanUrl = \substr($cleanUrl, \strlen('core'));
-			if (\preg_match('/\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
-				list(,$cleanUrl,$color) = $matches;
-				$location = \OC::$SERVERROOT . '/core/img/' . $cleanUrl . '.svg';
-			}
-		} elseif (\strpos($url, $base) === 0) {
-			if(\preg_match('/([A-z0-9\_\-]+)\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
-				list(,$app,$cleanUrl, $color) = $matches;
-				$location = \OC_App::getAppPath($app) . '/img/' . $cleanUrl . '.svg';
-				if ($app === 'settings') {
-					$location = \OC::$SERVERROOT . '/settings/img/' . $cleanUrl . '.svg';
-				}
-			}
-
-		}
-		return [
-			$location,
-			$color
-		];
-	}
-
-	/**
-	 * @param $svg
-	 * @param $color
-	 * @return string
-	 */
-	public function colorizeSvg($svg, $color): string {
-		if (!preg_match('/^[0-9a-f]{3,6}$/i', $color)) {
-			// Prevent not-sane colors from being written into the SVG
-			$color = '000';
-		}
-
-		// add fill (fill is not present on black elements)
-		$fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;,])+)\/>/mi';
-		$svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);
-
-		// replace any fill or stroke colors
-		$svg = preg_replace('/stroke="#([a-z0-9]{3,6})"/mi', 'stroke="#' . $color . '"', $svg);
-		$svg = preg_replace('/fill="#([a-z0-9]{3,6})"/mi', 'fill="#' . $color . '"', $svg);
-		return $svg;
-	}
-
-	private function getRoutePrefix() {
-		$frontControllerActive = (\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
-		$prefix = \OC::$WEBROOT . '/index.php';
-		if ($frontControllerActive) {
-			$prefix = \OC::$WEBROOT;
-		}
-		return $prefix;
-	}
-
-	/**
-	 * Get icons css file
-	 * @return ISimpleFile|boolean
-	 */
-	public function getCachedCSS() {
-		try {
-			if (!$this->cachedCss) {
-				$this->cachedCss = $this->folder->getFile($this->fileName);
-			}
-			return $this->cachedCss;
-		} catch (NotFoundException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Get icon-vars list template
-	 * @return ISimpleFile|boolean
-	 */
-	public function getCachedList() {
-		try {
-			if (!$this->cachedList) {
-				$this->cachedList = $this->folder->getFile($this->iconList);
-			}
-			return $this->cachedList;
-		} catch (NotFoundException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Add the icons cache css into the header
-	 */
-	public function injectCss() {
-		$mtime = $this->timeFactory->getTime();
-		$file = $this->getCachedList();
-		if ($file) {
-			$mtime = $file->getMTime();
-		}
-		// Only inject once
-		foreach (\OC_Util::$headers as $header) {
-			if (
-				array_key_exists('attributes', $header) &&
-				array_key_exists('href', $header['attributes']) &&
-				strpos($header['attributes']['href'], $this->fileName) !== false) {
-				return;
-			}
-		}
-		$linkToCSS = $this->urlGenerator->linkToRoute('core.Css.getCss', ['appName' => 'icons', 'fileName' => $this->fileName, 'v' => $mtime]);
-		\OC_Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS], null, true);
-	}
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var IAppData */
+    protected $appData;
+
+    /** @var ISimpleFolder */
+    private $folder;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var ITimeFactory */
+    protected $timeFactory;
+
+    /** @var string */
+    private $iconVarRE = '/--(icon-[a-zA-Z0-9-]+):\s?url\(["\']?([a-zA-Z0-9-_\~\/\.\?\&\=\:\;\+\,]+)[^;]+;/m';
+
+    /** @var string */
+    private $fileName = 'icons-vars.css';
+
+    private $iconList = 'icons-list.template';
+
+    private $cachedCss;
+    private $cachedList;
+
+    /**
+     * @param ILogger $logger
+     * @param Factory $appDataFactory
+     * @param IURLGenerator $urlGenerator
+     * @param ITimeFactory $timeFactory
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function __construct(ILogger $logger,
+                                Factory $appDataFactory,
+                                IURLGenerator $urlGenerator,
+                                ITimeFactory $timeFactory) {
+        $this->logger       = $logger;
+        $this->appData      = $appDataFactory->get('css');
+        $this->urlGenerator = $urlGenerator;
+        $this->timeFactory  = $timeFactory;
+
+        try {
+            $this->folder = $this->appData->getFolder('icons');
+        } catch (NotFoundException $e) {
+            $this->folder = $this->appData->newFolder('icons');
+        }
+    }
+
+    private function getIconsFromCss(string $css): array {
+        preg_match_all($this->iconVarRE, $css, $matches, PREG_SET_ORDER);
+        $icons = [];
+        foreach ($matches as $icon) {
+            $icons[$icon[1]] = $icon[2];
+        }
+
+        return $icons;
+    }
+
+    /**
+     * @param string $css
+     * @return string
+     * @throws NotFoundException
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function setIconsCss(string $css): string {
+
+        $cachedFile = $this->getCachedList();
+        if (!$cachedFile) {
+            $currentData = '';
+            $cachedFile = $this->folder->newFile($this->iconList);
+        } else {
+            $currentData = $cachedFile->getContent();
+        }
+
+        $cachedVarsCssFile = $this->getCachedCSS();
+        if (!$cachedVarsCssFile) {
+            $cachedVarsCssFile = $this->folder->newFile($this->fileName);
+        }
+
+        $icons = $this->getIconsFromCss($currentData . $css);
+
+        $data = '';
+        $list = '';
+        foreach ($icons as $icon => $url) {
+            $list .= "--$icon: url('$url');";
+            list($location,$color) = $this->parseUrl($url);
+            $svg = false;
+            if ($location !== '' && \file_exists($location)) {
+                $svg = \file_get_contents($location);
+            }
+            if ($svg === false) {
+                $this->logger->debug('Failed to get icon file ' . $location);
+                $data .= "--$icon: url('$url');";
+                continue;
+            }
+            $encode = base64_encode($this->colorizeSvg($svg, $color));
+            $data .= '--' . $icon . ': url(data:image/svg+xml;base64,' . $encode . ');';
+        }
+
+        if (\strlen($data) > 0 && \strlen($list) > 0) {
+            $data = ":root {\n$data\n}";
+            $cachedVarsCssFile->putContent($data);
+            $list = ":root {\n$list\n}";
+            $cachedFile->putContent($list);
+            $this->cachedList = null;
+            $this->cachedCss = null;
+        }
+
+        return preg_replace($this->iconVarRE, '', $css);
+    }
+
+    /**
+     * @param $url
+     * @return array
+     */
+    private function parseUrl($url): array {
+        $location = '';
+        $color = '';
+        $base = $this->getRoutePrefix() . '/svg/';
+        $cleanUrl = \substr($url, \strlen($base));
+        if (\strpos($url, $base . 'core') === 0) {
+            $cleanUrl = \substr($cleanUrl, \strlen('core'));
+            if (\preg_match('/\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
+                list(,$cleanUrl,$color) = $matches;
+                $location = \OC::$SERVERROOT . '/core/img/' . $cleanUrl . '.svg';
+            }
+        } elseif (\strpos($url, $base) === 0) {
+            if(\preg_match('/([A-z0-9\_\-]+)\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
+                list(,$app,$cleanUrl, $color) = $matches;
+                $location = \OC_App::getAppPath($app) . '/img/' . $cleanUrl . '.svg';
+                if ($app === 'settings') {
+                    $location = \OC::$SERVERROOT . '/settings/img/' . $cleanUrl . '.svg';
+                }
+            }
+
+        }
+        return [
+            $location,
+            $color
+        ];
+    }
+
+    /**
+     * @param $svg
+     * @param $color
+     * @return string
+     */
+    public function colorizeSvg($svg, $color): string {
+        if (!preg_match('/^[0-9a-f]{3,6}$/i', $color)) {
+            // Prevent not-sane colors from being written into the SVG
+            $color = '000';
+        }
+
+        // add fill (fill is not present on black elements)
+        $fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;,])+)\/>/mi';
+        $svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);
+
+        // replace any fill or stroke colors
+        $svg = preg_replace('/stroke="#([a-z0-9]{3,6})"/mi', 'stroke="#' . $color . '"', $svg);
+        $svg = preg_replace('/fill="#([a-z0-9]{3,6})"/mi', 'fill="#' . $color . '"', $svg);
+        return $svg;
+    }
+
+    private function getRoutePrefix() {
+        $frontControllerActive = (\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
+        $prefix = \OC::$WEBROOT . '/index.php';
+        if ($frontControllerActive) {
+            $prefix = \OC::$WEBROOT;
+        }
+        return $prefix;
+    }
+
+    /**
+     * Get icons css file
+     * @return ISimpleFile|boolean
+     */
+    public function getCachedCSS() {
+        try {
+            if (!$this->cachedCss) {
+                $this->cachedCss = $this->folder->getFile($this->fileName);
+            }
+            return $this->cachedCss;
+        } catch (NotFoundException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Get icon-vars list template
+     * @return ISimpleFile|boolean
+     */
+    public function getCachedList() {
+        try {
+            if (!$this->cachedList) {
+                $this->cachedList = $this->folder->getFile($this->iconList);
+            }
+            return $this->cachedList;
+        } catch (NotFoundException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Add the icons cache css into the header
+     */
+    public function injectCss() {
+        $mtime = $this->timeFactory->getTime();
+        $file = $this->getCachedList();
+        if ($file) {
+            $mtime = $file->getMTime();
+        }
+        // Only inject once
+        foreach (\OC_Util::$headers as $header) {
+            if (
+                array_key_exists('attributes', $header) &&
+                array_key_exists('href', $header['attributes']) &&
+                strpos($header['attributes']['href'], $this->fileName) !== false) {
+                return;
+            }
+        }
+        $linkToCSS = $this->urlGenerator->linkToRoute('core.Css.getCss', ['appName' => 'icons', 'fileName' => $this->fileName, 'v' => $mtime]);
+        \OC_Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS], null, true);
+    }
 
 }

lib/private/Template/SCSSCacher.php

Indentation +455 added lines, -455 removed lines

@@ -50,459 +50,459 @@
 
 class SCSSCacher {
 
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var IAppData */
-	protected $appData;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var \OC_Defaults */
-	private $defaults;
-
-	/** @var string */
-	protected $serverRoot;
-
-	/** @var ICache */
-	protected $depsCache;
-
-	/** @var null|string */
-	private $injectedVariables;
-
-	/** @var ICacheFactory */
-	private $cacheFactory;
-
-	/** @var IconsCacher */
-	private $iconsCacher;
-
-	/** @var ICache */
-	private $isCachedCache;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var IMemcache */
-	private $lockingCache;
-
-	/**
-	 * @param ILogger $logger
-	 * @param Factory $appDataFactory
-	 * @param IURLGenerator $urlGenerator
-	 * @param IConfig $config
-	 * @param \OC_Defaults $defaults
-	 * @param string $serverRoot
-	 * @param ICacheFactory $cacheFactory
-	 * @param IconsCacher $iconsCacher
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(ILogger $logger,
-								Factory $appDataFactory,
-								IURLGenerator $urlGenerator,
-								IConfig $config,
-								\OC_Defaults $defaults,
-								$serverRoot,
-								ICacheFactory $cacheFactory,
-								IconsCacher $iconsCacher,
-								ITimeFactory $timeFactory) {
-		$this->logger       = $logger;
-		$this->appData      = $appDataFactory->get('css');
-		$this->urlGenerator = $urlGenerator;
-		$this->config       = $config;
-		$this->defaults     = $defaults;
-		$this->serverRoot   = $serverRoot;
-		$this->cacheFactory = $cacheFactory;
-		$this->depsCache    = $cacheFactory->createDistributed('SCSS-deps-' . md5($this->urlGenerator->getBaseUrl()));
-		$this->isCachedCache = $cacheFactory->createLocal('SCSS-cached-' . md5($this->urlGenerator->getBaseUrl()));
-		$lockingCache = $cacheFactory->createDistributed('SCSS-locks-' . md5($this->urlGenerator->getBaseUrl()));
-		if (!($lockingCache instanceof IMemcache)) {
-			$lockingCache = new NullCache();
-		}
-		$this->lockingCache = $lockingCache;
-		$this->iconsCacher = $iconsCacher;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * 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
-	 * @throws NotPermittedException
-	 */
-	public function process(string $root, string $file, string $app): bool {
-		$path = explode('/', $root . '/' . $file);
-
-		$fileNameSCSS = array_pop($path);
-		$fileNameCSS  = $this->prependVersionPrefix($this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS)), $app);
-
-		$path   = implode('/', $path);
-		$webDir = $this->getWebDir($path, $app, $this->serverRoot, \OC::$WEBROOT);
-
-		if (!$this->variablesChanged() && $this->isCached($fileNameCSS, $app)) {
-			// Inject icons vars css if any
-			return $this->injectCssVariablesIfAny();
-		}
-
-		try {
-			$folder = $this->appData->getFolder($app);
-		} catch (NotFoundException $e) {
-			// creating css appdata folder
-			$folder = $this->appData->newFolder($app);
-		}
-
-		$lockKey = $webDir . '/' . $fileNameSCSS;
-
-		if (!$this->lockingCache->add($lockKey, 'locked!', 120)) {
-			$retry = 0;
-			sleep(1);
-			while ($retry < 10) {
-				if (!$this->variablesChanged() && $this->isCached($fileNameCSS, $app)) {
-					// Inject icons vars css if any
-					$this->lockingCache->remove($lockKey);
-					$this->logger->debug('SCSSCacher: ' .$lockKey.' is now available after '.$retry.'s. Moving on...', ['app' => 'core']);
-					return $this->injectCssVariablesIfAny();
-				}
-				$this->logger->debug('SCSSCacher: scss cache file locked for '.$lockKey, ['app' => 'core']);
-				sleep($retry);
-				$retry++;
-			}
-			$this->logger->debug('SCSSCacher: Giving up scss caching for '.$lockKey, ['app' => 'core']);
-			return false;
-		}
-
-		try {
-			$cached = $this->cache($path, $fileNameCSS, $fileNameSCSS, $folder, $webDir);
-		} catch (\Exception $e) {
-			$this->lockingCache->remove($lockKey);
-			throw $e;
-		}
-
-		// Cleaning lock
-		$this->lockingCache->remove($lockKey);
-
-		// Inject icons vars css if any
-		if ($this->iconsCacher->getCachedCSS() && $this->iconsCacher->getCachedCSS()->getSize() > 0) {
-			$this->iconsCacher->injectCss();
-		}
-
-		return $cached;
-	}
-
-	/**
-	 * @param $appName
-	 * @param $fileName
-	 * @return ISimpleFile
-	 */
-	public function getCachedCSS(string $appName, string $fileName): ISimpleFile {
-		$folder         = $this->appData->getFolder($appName);
-		$cachedFileName = $this->prependVersionPrefix($this->prependBaseurlPrefix($fileName), $appName);
-
-		return $folder->getFile($cachedFileName);
-	}
-
-	/**
-	 * Check if the file is cached or not
-	 * @param string $fileNameCSS
-	 * @param string $app
-	 * @return boolean
-	 */
-	private function isCached(string $fileNameCSS, string $app) {
-		$key = $this->config->getSystemValue('version') . '/' . $app . '/' . $fileNameCSS;
-
-		// If the file mtime is more recent than our cached one,
-		// let's consider the file is properly cached
-		if ($cacheValue = $this->isCachedCache->get($key)) {
-			if ($cacheValue > $this->timeFactory->getTime()) {
-				return true;
-			}
-		}
-
-		// Creating file cache if none for further checks
-		try {
-			$folder = $this->appData->getFolder($app);
-		} catch (NotFoundException $e) {
-			return false;
-		}
-
-		// Checking if file size is coherent
-		// and if one of the css dependency changed
-		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 ((array) $deps as $file => $mtime) {
-					if (!file_exists($file) || filemtime($file) > $mtime) {
-						return false;
-					}
-				}
-
-				$this->isCachedCache->set($key, $this->timeFactory->getTime() + 5 * 60);
-				return true;
-			}
-
-			return false;
-		} catch (NotFoundException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Check if the variables file has changed
-	 * @return bool
-	 */
-	private function variablesChanged(): bool {
-		$injectedVariables = $this->getInjectedVariables();
-		if ($this->config->getAppValue('core', 'theming.variables') !== md5($injectedVariables)) {
-			$this->resetCache();
-			$this->config->setAppValue('core', 'theming.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
-	 * @throws NotPermittedException
-	 */
-	private function cache(string $path, string $fileNameCSS, string $fileNameSCSS, ISimpleFolder $folder, string $webDir) {
-		$scss = new Compiler();
-		$scss->setImportPaths([
-			$path,
-			$this->serverRoot . '/core/css/'
-		]);
-
-		// Continue after throw
-		$scss->setIgnoreErrors(true);
-		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(
-				'$webroot: \'' . $this->getRoutePrefix() . '\';' .
-				$this->getInjectedVariables() .
-				'@import "variables.scss";' .
-				'@import "functions.scss";' .
-				'@import "' . $fileNameSCSS . '";');
-		} catch (ParserException $e) {
-			$this->logger->logException($e, ['app' => 'core']);
-
-			return false;
-		}
-
-		// Parse Icons and create related css variables
-		$compiledScss = $this->iconsCacher->setIconsCss($compiledScss);
-
-		// Gzip file
-		try {
-			$gzipFile = $folder->getFile($fileNameCSS . '.gzip'); # Safari doesn't like .gz
-		} catch (NotFoundException $e) {
-			$gzipFile = $folder->newFile($fileNameCSS . '.gzip'); # Safari doesn't like .gz
-		}
-
-		try {
-			$data = $this->rebaseUrls($compiledScss, $webDir);
-			$cachedfile->putContent($data);
-			$deps = json_encode($scss->getParsedFiles());
-			$depFile->putContent($deps);
-			$this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
-			$gzipFile->putContent(gzencode($data, 9));
-			$this->logger->debug('SCSSCacher: ' . $webDir . '/' . $fileNameSCSS . ' compiled and successfully cached', ['app' => 'core']);
-
-			return true;
-		} catch (NotPermittedException $e) {
-			$this->logger->error('SCSSCacher: unable to cache: ' . $fileNameSCSS);
-
-			return false;
-		}
-	}
-
-	/**
-	 * Reset scss cache by deleting all generated css files
-	 * We need to regenerate all files when variables change
-	 */
-	public function resetCache() {
-		$this->injectedVariables = null;
-
-		// do not clear locks
-		$this->cacheFactory->createDistributed('SCSS-deps-')->clear();
-		$this->cacheFactory->createDistributed('SCSS-cached-')->clear();
-
-		$appDirectory = $this->appData->getDirectoryListing();
-		foreach ($appDirectory as $folder) {
-			foreach ($folder->getDirectoryListing() as $file) {
-				try {
-					$file->delete();
-				} catch (NotPermittedException $e) {
-					$this->logger->logException($e, ['message' => 'SCSSCacher: unable to delete file: ' . $file->getName()]);
-				}
-			}
-		}
-		$this->logger->debug('SCSSCacher: css cache cleared!');
-	}
-
-	/**
-	 * @return string SCSS code for variables from OC_Defaults
-	 */
-	private function getInjectedVariables(): string {
-		if ($this->injectedVariables !== null) {
-			return $this->injectedVariables;
-		}
-		$variables = '';
-		foreach ($this->defaults->getScssVariables() as $key => $value) {
-			$variables .= '$' . $key . ': ' . $value . ' !default;';
-		}
-
-		// check for valid variables / otherwise fall back to defaults
-		try {
-			$scss = new Compiler();
-			$scss->compile($variables);
-			$this->injectedVariables = $variables;
-		} catch (ParserException $e) {
-			$this->logger->logException($e, ['app' => 'core']);
-		}
-
-		return $variables;
-	}
-
-	/**
-	 * Add the correct uri prefix to make uri valid again
-	 * @param string $css
-	 * @param string $webDir
-	 * @return string
-	 */
-	private function rebaseUrls(string $css, string $webDir): string {
-		$re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
-		$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(string $appName, string $fileName): string {
-		$tmpfileLoc = explode('/', $fileName);
-		$fileName   = array_pop($tmpfileLoc);
-		$fileName   = $this->prependVersionPrefix($this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileName)), $appName);
-
-		return substr($this->urlGenerator->linkToRoute('core.Css.getCss', [
-			'fileName' => $fileName,
-			'appName' => $appName,
-			'v' => $this->config->getAppValue('core', 'theming.variables', '0')
-		]), \strlen(\OC::$WEBROOT) + 1);
-	}
-
-	/**
-	 * Prepend hashed base url to the css file
-	 * @param string $cssFile
-	 * @return string
-	 */
-	private function prependBaseurlPrefix(string $cssFile): string {
-		return substr(md5($this->urlGenerator->getBaseUrl() . $this->getRoutePrefix()), 0, 4) . '-' . $cssFile;
-	}
-
-	private function getRoutePrefix() {
-		$frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
-		$prefix = \OC::$WEBROOT . '/index.php';
-		if ($frontControllerActive) {
-			$prefix = \OC::$WEBROOT;
-		}
-		return $prefix;
-	}
-
-	/**
-	 * Prepend hashed app version hash
-	 * @param string $cssFile
-	 * @param string $appId
-	 * @return string
-	 */
-	private function prependVersionPrefix(string $cssFile, string $appId): string {
-		$appVersion = \OC_App::getAppVersion($appId);
-		if ($appVersion !== '0') {
-			return substr(md5($appVersion), 0, 4) . '-' . $cssFile;
-		}
-		$coreVersion = \OC_Util::getVersionString();
-
-		return substr(md5($coreVersion), 0, 4) . '-' . $cssFile;
-	}
-
-	/**
-	 * Get WebDir root
-	 * @param string $path the css file path
-	 * @param string $appName the app name
-	 * @param string $serverRoot the server root path
-	 * @param string $webRoot the nextcloud installation root path
-	 * @return string the webDir
-	 */
-	private function getWebDir(string $path, string $appName, string $serverRoot, string $webRoot): string {
-		// Detect if path is within server root AND if path is within an app path
-		if (strpos($path, $serverRoot) === false && $appWebPath = \OC_App::getAppWebPath($appName)) {
-			// Get the file path within the app directory
-			$appDirectoryPath = explode($appName, $path)[1];
-			// Remove the webroot
-
-			return str_replace($webRoot, '', $appWebPath . $appDirectoryPath);
-		}
-
-		return $webRoot . substr($path, strlen($serverRoot));
-	}
-
-	/**
-	 * Add the icons css cache in the header if needed 
-	 *
-	 * @return boolean true
-	 */
-	private function injectCssVariablesIfAny() {
-		// Inject icons vars css if any
-		if ($this->iconsCacher->getCachedCSS() && $this->iconsCacher->getCachedCSS()->getSize() > 0) {
-			$this->iconsCacher->injectCss();
-		}
-		return true;
-	}
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var IAppData */
+    protected $appData;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var \OC_Defaults */
+    private $defaults;
+
+    /** @var string */
+    protected $serverRoot;
+
+    /** @var ICache */
+    protected $depsCache;
+
+    /** @var null|string */
+    private $injectedVariables;
+
+    /** @var ICacheFactory */
+    private $cacheFactory;
+
+    /** @var IconsCacher */
+    private $iconsCacher;
+
+    /** @var ICache */
+    private $isCachedCache;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var IMemcache */
+    private $lockingCache;
+
+    /**
+     * @param ILogger $logger
+     * @param Factory $appDataFactory
+     * @param IURLGenerator $urlGenerator
+     * @param IConfig $config
+     * @param \OC_Defaults $defaults
+     * @param string $serverRoot
+     * @param ICacheFactory $cacheFactory
+     * @param IconsCacher $iconsCacher
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(ILogger $logger,
+                                Factory $appDataFactory,
+                                IURLGenerator $urlGenerator,
+                                IConfig $config,
+                                \OC_Defaults $defaults,
+                                $serverRoot,
+                                ICacheFactory $cacheFactory,
+                                IconsCacher $iconsCacher,
+                                ITimeFactory $timeFactory) {
+        $this->logger       = $logger;
+        $this->appData      = $appDataFactory->get('css');
+        $this->urlGenerator = $urlGenerator;
+        $this->config       = $config;
+        $this->defaults     = $defaults;
+        $this->serverRoot   = $serverRoot;
+        $this->cacheFactory = $cacheFactory;
+        $this->depsCache    = $cacheFactory->createDistributed('SCSS-deps-' . md5($this->urlGenerator->getBaseUrl()));
+        $this->isCachedCache = $cacheFactory->createLocal('SCSS-cached-' . md5($this->urlGenerator->getBaseUrl()));
+        $lockingCache = $cacheFactory->createDistributed('SCSS-locks-' . md5($this->urlGenerator->getBaseUrl()));
+        if (!($lockingCache instanceof IMemcache)) {
+            $lockingCache = new NullCache();
+        }
+        $this->lockingCache = $lockingCache;
+        $this->iconsCacher = $iconsCacher;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * 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
+     * @throws NotPermittedException
+     */
+    public function process(string $root, string $file, string $app): bool {
+        $path = explode('/', $root . '/' . $file);
+
+        $fileNameSCSS = array_pop($path);
+        $fileNameCSS  = $this->prependVersionPrefix($this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS)), $app);
+
+        $path   = implode('/', $path);
+        $webDir = $this->getWebDir($path, $app, $this->serverRoot, \OC::$WEBROOT);
+
+        if (!$this->variablesChanged() && $this->isCached($fileNameCSS, $app)) {
+            // Inject icons vars css if any
+            return $this->injectCssVariablesIfAny();
+        }
+
+        try {
+            $folder = $this->appData->getFolder($app);
+        } catch (NotFoundException $e) {
+            // creating css appdata folder
+            $folder = $this->appData->newFolder($app);
+        }
+
+        $lockKey = $webDir . '/' . $fileNameSCSS;
+
+        if (!$this->lockingCache->add($lockKey, 'locked!', 120)) {
+            $retry = 0;
+            sleep(1);
+            while ($retry < 10) {
+                if (!$this->variablesChanged() && $this->isCached($fileNameCSS, $app)) {
+                    // Inject icons vars css if any
+                    $this->lockingCache->remove($lockKey);
+                    $this->logger->debug('SCSSCacher: ' .$lockKey.' is now available after '.$retry.'s. Moving on...', ['app' => 'core']);
+                    return $this->injectCssVariablesIfAny();
+                }
+                $this->logger->debug('SCSSCacher: scss cache file locked for '.$lockKey, ['app' => 'core']);
+                sleep($retry);
+                $retry++;
+            }
+            $this->logger->debug('SCSSCacher: Giving up scss caching for '.$lockKey, ['app' => 'core']);
+            return false;
+        }
+
+        try {
+            $cached = $this->cache($path, $fileNameCSS, $fileNameSCSS, $folder, $webDir);
+        } catch (\Exception $e) {
+            $this->lockingCache->remove($lockKey);
+            throw $e;
+        }
+
+        // Cleaning lock
+        $this->lockingCache->remove($lockKey);
+
+        // Inject icons vars css if any
+        if ($this->iconsCacher->getCachedCSS() && $this->iconsCacher->getCachedCSS()->getSize() > 0) {
+            $this->iconsCacher->injectCss();
+        }
+
+        return $cached;
+    }
+
+    /**
+     * @param $appName
+     * @param $fileName
+     * @return ISimpleFile
+     */
+    public function getCachedCSS(string $appName, string $fileName): ISimpleFile {
+        $folder         = $this->appData->getFolder($appName);
+        $cachedFileName = $this->prependVersionPrefix($this->prependBaseurlPrefix($fileName), $appName);
+
+        return $folder->getFile($cachedFileName);
+    }
+
+    /**
+     * Check if the file is cached or not
+     * @param string $fileNameCSS
+     * @param string $app
+     * @return boolean
+     */
+    private function isCached(string $fileNameCSS, string $app) {
+        $key = $this->config->getSystemValue('version') . '/' . $app . '/' . $fileNameCSS;
+
+        // If the file mtime is more recent than our cached one,
+        // let's consider the file is properly cached
+        if ($cacheValue = $this->isCachedCache->get($key)) {
+            if ($cacheValue > $this->timeFactory->getTime()) {
+                return true;
+            }
+        }
+
+        // Creating file cache if none for further checks
+        try {
+            $folder = $this->appData->getFolder($app);
+        } catch (NotFoundException $e) {
+            return false;
+        }
+
+        // Checking if file size is coherent
+        // and if one of the css dependency changed
+        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 ((array) $deps as $file => $mtime) {
+                    if (!file_exists($file) || filemtime($file) > $mtime) {
+                        return false;
+                    }
+                }
+
+                $this->isCachedCache->set($key, $this->timeFactory->getTime() + 5 * 60);
+                return true;
+            }
+
+            return false;
+        } catch (NotFoundException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Check if the variables file has changed
+     * @return bool
+     */
+    private function variablesChanged(): bool {
+        $injectedVariables = $this->getInjectedVariables();
+        if ($this->config->getAppValue('core', 'theming.variables') !== md5($injectedVariables)) {
+            $this->resetCache();
+            $this->config->setAppValue('core', 'theming.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
+     * @throws NotPermittedException
+     */
+    private function cache(string $path, string $fileNameCSS, string $fileNameSCSS, ISimpleFolder $folder, string $webDir) {
+        $scss = new Compiler();
+        $scss->setImportPaths([
+            $path,
+            $this->serverRoot . '/core/css/'
+        ]);
+
+        // Continue after throw
+        $scss->setIgnoreErrors(true);
+        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(
+                '$webroot: \'' . $this->getRoutePrefix() . '\';' .
+                $this->getInjectedVariables() .
+                '@import "variables.scss";' .
+                '@import "functions.scss";' .
+                '@import "' . $fileNameSCSS . '";');
+        } catch (ParserException $e) {
+            $this->logger->logException($e, ['app' => 'core']);
+
+            return false;
+        }
+
+        // Parse Icons and create related css variables
+        $compiledScss = $this->iconsCacher->setIconsCss($compiledScss);
+
+        // Gzip file
+        try {
+            $gzipFile = $folder->getFile($fileNameCSS . '.gzip'); # Safari doesn't like .gz
+        } catch (NotFoundException $e) {
+            $gzipFile = $folder->newFile($fileNameCSS . '.gzip'); # Safari doesn't like .gz
+        }
+
+        try {
+            $data = $this->rebaseUrls($compiledScss, $webDir);
+            $cachedfile->putContent($data);
+            $deps = json_encode($scss->getParsedFiles());
+            $depFile->putContent($deps);
+            $this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
+            $gzipFile->putContent(gzencode($data, 9));
+            $this->logger->debug('SCSSCacher: ' . $webDir . '/' . $fileNameSCSS . ' compiled and successfully cached', ['app' => 'core']);
+
+            return true;
+        } catch (NotPermittedException $e) {
+            $this->logger->error('SCSSCacher: unable to cache: ' . $fileNameSCSS);
+
+            return false;
+        }
+    }
+
+    /**
+     * Reset scss cache by deleting all generated css files
+     * We need to regenerate all files when variables change
+     */
+    public function resetCache() {
+        $this->injectedVariables = null;
+
+        // do not clear locks
+        $this->cacheFactory->createDistributed('SCSS-deps-')->clear();
+        $this->cacheFactory->createDistributed('SCSS-cached-')->clear();
+
+        $appDirectory = $this->appData->getDirectoryListing();
+        foreach ($appDirectory as $folder) {
+            foreach ($folder->getDirectoryListing() as $file) {
+                try {
+                    $file->delete();
+                } catch (NotPermittedException $e) {
+                    $this->logger->logException($e, ['message' => 'SCSSCacher: unable to delete file: ' . $file->getName()]);
+                }
+            }
+        }
+        $this->logger->debug('SCSSCacher: css cache cleared!');
+    }
+
+    /**
+     * @return string SCSS code for variables from OC_Defaults
+     */
+    private function getInjectedVariables(): string {
+        if ($this->injectedVariables !== null) {
+            return $this->injectedVariables;
+        }
+        $variables = '';
+        foreach ($this->defaults->getScssVariables() as $key => $value) {
+            $variables .= '$' . $key . ': ' . $value . ' !default;';
+        }
+
+        // check for valid variables / otherwise fall back to defaults
+        try {
+            $scss = new Compiler();
+            $scss->compile($variables);
+            $this->injectedVariables = $variables;
+        } catch (ParserException $e) {
+            $this->logger->logException($e, ['app' => 'core']);
+        }
+
+        return $variables;
+    }
+
+    /**
+     * Add the correct uri prefix to make uri valid again
+     * @param string $css
+     * @param string $webDir
+     * @return string
+     */
+    private function rebaseUrls(string $css, string $webDir): string {
+        $re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
+        $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(string $appName, string $fileName): string {
+        $tmpfileLoc = explode('/', $fileName);
+        $fileName   = array_pop($tmpfileLoc);
+        $fileName   = $this->prependVersionPrefix($this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileName)), $appName);
+
+        return substr($this->urlGenerator->linkToRoute('core.Css.getCss', [
+            'fileName' => $fileName,
+            'appName' => $appName,
+            'v' => $this->config->getAppValue('core', 'theming.variables', '0')
+        ]), \strlen(\OC::$WEBROOT) + 1);
+    }
+
+    /**
+     * Prepend hashed base url to the css file
+     * @param string $cssFile
+     * @return string
+     */
+    private function prependBaseurlPrefix(string $cssFile): string {
+        return substr(md5($this->urlGenerator->getBaseUrl() . $this->getRoutePrefix()), 0, 4) . '-' . $cssFile;
+    }
+
+    private function getRoutePrefix() {
+        $frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
+        $prefix = \OC::$WEBROOT . '/index.php';
+        if ($frontControllerActive) {
+            $prefix = \OC::$WEBROOT;
+        }
+        return $prefix;
+    }
+
+    /**
+     * Prepend hashed app version hash
+     * @param string $cssFile
+     * @param string $appId
+     * @return string
+     */
+    private function prependVersionPrefix(string $cssFile, string $appId): string {
+        $appVersion = \OC_App::getAppVersion($appId);
+        if ($appVersion !== '0') {
+            return substr(md5($appVersion), 0, 4) . '-' . $cssFile;
+        }
+        $coreVersion = \OC_Util::getVersionString();
+
+        return substr(md5($coreVersion), 0, 4) . '-' . $cssFile;
+    }
+
+    /**
+     * Get WebDir root
+     * @param string $path the css file path
+     * @param string $appName the app name
+     * @param string $serverRoot the server root path
+     * @param string $webRoot the nextcloud installation root path
+     * @return string the webDir
+     */
+    private function getWebDir(string $path, string $appName, string $serverRoot, string $webRoot): string {
+        // Detect if path is within server root AND if path is within an app path
+        if (strpos($path, $serverRoot) === false && $appWebPath = \OC_App::getAppWebPath($appName)) {
+            // Get the file path within the app directory
+            $appDirectoryPath = explode($appName, $path)[1];
+            // Remove the webroot
+
+            return str_replace($webRoot, '', $appWebPath . $appDirectoryPath);
+        }
+
+        return $webRoot . substr($path, strlen($serverRoot));
+    }
+
+    /**
+     * Add the icons css cache in the header if needed 
+     *
+     * @return boolean true
+     */
+    private function injectCssVariablesIfAny() {
+        // Inject icons vars css if any
+        if ($this->iconsCacher->getCachedCSS() && $this->iconsCacher->getCachedCSS()->getSize() > 0) {
+            $this->iconsCacher->injectCss();
+        }
+        return true;
+    }
 }

Spacing +31 added lines, -31 removed lines

@@ -116,9 +116,9 @@ 
 		$this->defaults     = $defaults;
 		$this->serverRoot   = $serverRoot;
 		$this->cacheFactory = $cacheFactory;
-		$this->depsCache    = $cacheFactory->createDistributed('SCSS-deps-' . md5($this->urlGenerator->getBaseUrl()));
-		$this->isCachedCache = $cacheFactory->createLocal('SCSS-cached-' . md5($this->urlGenerator->getBaseUrl()));
-		$lockingCache = $cacheFactory->createDistributed('SCSS-locks-' . md5($this->urlGenerator->getBaseUrl()));
+		$this->depsCache    = $cacheFactory->createDistributed('SCSS-deps-'.md5($this->urlGenerator->getBaseUrl()));
+		$this->isCachedCache = $cacheFactory->createLocal('SCSS-cached-'.md5($this->urlGenerator->getBaseUrl()));
+		$lockingCache = $cacheFactory->createDistributed('SCSS-locks-'.md5($this->urlGenerator->getBaseUrl()));
 		if (!($lockingCache instanceof IMemcache)) {
 			$lockingCache = new NullCache();
 		}
@@ -137,7 +137,7 @@ 
 	 * @throws NotPermittedException
 	 */
 	public function process(string $root, string $file, string $app): bool {
-		$path = explode('/', $root . '/' . $file);
+		$path = explode('/', $root.'/'.$file);
 
 		$fileNameSCSS = array_pop($path);
 		$fileNameCSS  = $this->prependVersionPrefix($this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS)), $app);
@@ -157,7 +157,7 @@ 
 			$folder = $this->appData->newFolder($app);
 		}
 
-		$lockKey = $webDir . '/' . $fileNameSCSS;
+		$lockKey = $webDir.'/'.$fileNameSCSS;
 
 		if (!$this->lockingCache->add($lockKey, 'locked!', 120)) {
 			$retry = 0;
@@ -166,7 +166,7 @@ 
 				if (!$this->variablesChanged() && $this->isCached($fileNameCSS, $app)) {
 					// Inject icons vars css if any
 					$this->lockingCache->remove($lockKey);
-					$this->logger->debug('SCSSCacher: ' .$lockKey.' is now available after '.$retry.'s. Moving on...', ['app' => 'core']);
+					$this->logger->debug('SCSSCacher: '.$lockKey.' is now available after '.$retry.'s. Moving on...', ['app' => 'core']);
 					return $this->injectCssVariablesIfAny();
 				}
 				$this->logger->debug('SCSSCacher: scss cache file locked for '.$lockKey, ['app' => 'core']);
@@ -214,7 +214,7 @@ 
 	 * @return boolean
 	 */
 	private function isCached(string $fileNameCSS, string $app) {
-		$key = $this->config->getSystemValue('version') . '/' . $app . '/' . $fileNameCSS;
+		$key = $this->config->getSystemValue('version').'/'.$app.'/'.$fileNameCSS;
 
 		// If the file mtime is more recent than our cached one,
 		// let's consider the file is properly cached
@@ -236,13 +236,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);
 
@@ -291,7 +291,7 @@ 
 		$scss = new Compiler();
 		$scss->setImportPaths([
 			$path,
-			$this->serverRoot . '/core/css/'
+			$this->serverRoot.'/core/css/'
 		]);
 
 		// Continue after throw
@@ -311,7 +311,7 @@ 
 			$cachedfile = $folder->newFile($fileNameCSS);
 		}
 
-		$depFileName = $fileNameCSS . '.deps';
+		$depFileName = $fileNameCSS.'.deps';
 		try {
 			$depFile = $folder->getFile($depFileName);
 		} catch (NotFoundException $e) {
@@ -321,11 +321,11 @@ 
 		// Compile
 		try {
 			$compiledScss = $scss->compile(
-				'$webroot: \'' . $this->getRoutePrefix() . '\';' .
-				$this->getInjectedVariables() .
-				'@import "variables.scss";' .
-				'@import "functions.scss";' .
-				'@import "' . $fileNameSCSS . '";');
+				'$webroot: \''.$this->getRoutePrefix().'\';'.
+				$this->getInjectedVariables().
+				'@import "variables.scss";'.
+				'@import "functions.scss";'.
+				'@import "'.$fileNameSCSS.'";');
 		} catch (ParserException $e) {
 			$this->logger->logException($e, ['app' => 'core']);
 
@@ -337,9 +337,9 @@ 
 
 		// Gzip file
 		try {
-			$gzipFile = $folder->getFile($fileNameCSS . '.gzip'); # Safari doesn't like .gz
+			$gzipFile = $folder->getFile($fileNameCSS.'.gzip'); # Safari doesn't like .gz
 		} catch (NotFoundException $e) {
-			$gzipFile = $folder->newFile($fileNameCSS . '.gzip'); # Safari doesn't like .gz
+			$gzipFile = $folder->newFile($fileNameCSS.'.gzip'); # Safari doesn't like .gz
 		}
 
 		try {
@@ -347,13 +347,13 @@ 
 			$cachedfile->putContent($data);
 			$deps = json_encode($scss->getParsedFiles());
 			$depFile->putContent($deps);
-			$this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
+			$this->depsCache->set($folder->getName().'-'.$depFileName, $deps);
 			$gzipFile->putContent(gzencode($data, 9));
-			$this->logger->debug('SCSSCacher: ' . $webDir . '/' . $fileNameSCSS . ' compiled and successfully cached', ['app' => 'core']);
+			$this->logger->debug('SCSSCacher: '.$webDir.'/'.$fileNameSCSS.' compiled and successfully cached', ['app' => 'core']);
 
 			return true;
 		} catch (NotPermittedException $e) {
-			$this->logger->error('SCSSCacher: unable to cache: ' . $fileNameSCSS);
+			$this->logger->error('SCSSCacher: unable to cache: '.$fileNameSCSS);
 
 			return false;
 		}
@@ -376,7 +376,7 @@ 
 				try {
 					$file->delete();
 				} catch (NotPermittedException $e) {
-					$this->logger->logException($e, ['message' => 'SCSSCacher: unable to delete file: ' . $file->getName()]);
+					$this->logger->logException($e, ['message' => 'SCSSCacher: unable to delete file: '.$file->getName()]);
 				}
 			}
 		}
@@ -392,7 +392,7 @@ 
 		}
 		$variables = '';
 		foreach ($this->defaults->getScssVariables() as $key => $value) {
-			$variables .= '$' . $key . ': ' . $value . ' !default;';
+			$variables .= '$'.$key.': '.$value.' !default;';
 		}
 
 		// check for valid variables / otherwise fall back to defaults
@@ -415,7 +415,7 @@ 
 	 */
 	private function rebaseUrls(string $css, string $webDir): string {
 		$re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
-		$subst = 'url(\'' . $webDir . '/$1\')';
+		$subst = 'url(\''.$webDir.'/$1\')';
 
 		return preg_replace($re, $subst, $css);
 	}
@@ -444,12 +444,12 @@ 
 	 * @return string
 	 */
 	private function prependBaseurlPrefix(string $cssFile): string {
-		return substr(md5($this->urlGenerator->getBaseUrl() . $this->getRoutePrefix()), 0, 4) . '-' . $cssFile;
+		return substr(md5($this->urlGenerator->getBaseUrl().$this->getRoutePrefix()), 0, 4).'-'.$cssFile;
 	}
 
 	private function getRoutePrefix() {
 		$frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
-		$prefix = \OC::$WEBROOT . '/index.php';
+		$prefix = \OC::$WEBROOT.'/index.php';
 		if ($frontControllerActive) {
 			$prefix = \OC::$WEBROOT;
 		}
@@ -465,11 +465,11 @@ 
 	private function prependVersionPrefix(string $cssFile, string $appId): string {
 		$appVersion = \OC_App::getAppVersion($appId);
 		if ($appVersion !== '0') {
-			return substr(md5($appVersion), 0, 4) . '-' . $cssFile;
+			return substr(md5($appVersion), 0, 4).'-'.$cssFile;
 		}
 		$coreVersion = \OC_Util::getVersionString();
 
-		return substr(md5($coreVersion), 0, 4) . '-' . $cssFile;
+		return substr(md5($coreVersion), 0, 4).'-'.$cssFile;
 	}
 
 	/**
@@ -487,10 +487,10 @@ 
 			$appDirectoryPath = explode($appName, $path)[1];
 			// Remove the webroot
 
-			return str_replace($webRoot, '', $appWebPath . $appDirectoryPath);
+			return str_replace($webRoot, '', $appWebPath.$appDirectoryPath);
 		}
 
-		return $webRoot . substr($path, strlen($serverRoot));
+		return $webRoot.substr($path, strlen($serverRoot));
 	}
 
 	/**