nextcloud / server

lib/private/Template/SCSSCacher.php

Spacing +36 added lines, -36 removed lines

@@ -121,9 +121,9 @@ 
 		$this->defaults = $defaults;
 		$this->serverRoot = $serverRoot;
 		$this->cacheFactory = $cacheFactory;
-		$this->depsCache = $cacheFactory->createDistributed('SCSS-deps-' . md5($this->urlGenerator->getBaseUrl()));
-		$this->isCachedCache = $cacheFactory->createDistributed('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->createDistributed('SCSS-cached-'.md5($this->urlGenerator->getBaseUrl()));
+		$lockingCache = $cacheFactory->createDistributed('SCSS-locks-'.md5($this->urlGenerator->getBaseUrl()));
 		if (!($lockingCache instanceof IMemcache)) {
 			$lockingCache = new NullCache();
 		}
@@ -143,7 +143,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);
@@ -164,10 +164,10 @@ 
 			$folder = $this->appData->newFolder($app);
 		}
 
-		$lockKey = $webDir . '/' . $fileNameSCSS;
+		$lockKey = $webDir.'/'.$fileNameSCSS;
 
 		if (!$this->lockingCache->add($lockKey, 'locked!', 120)) {
-			$this->logger->debug('SCSSCacher::process could not get lock for ' . $lockKey . ' and will wait 10 seconds for cached file to be available', ['app' => 'scss_cacher']);
+			$this->logger->debug('SCSSCacher::process could not get lock for '.$lockKey.' and will wait 10 seconds for cached file to be available', ['app' => 'scss_cacher']);
 			$retry = 0;
 			sleep(1);
 			while ($retry < 10) {
@@ -181,11 +181,11 @@ 
 				sleep(1);
 				$retry++;
 			}
-			$this->logger->debug('SCSSCacher::process Giving up scss caching for ' . $lockKey, ['app' => 'scss_cacher']);
+			$this->logger->debug('SCSSCacher::process Giving up scss caching for '.$lockKey, ['app' => 'scss_cacher']);
 			return false;
 		}
 
-		$this->logger->debug('SCSSCacher::process Lock acquired for ' . $lockKey, ['app' => 'scss_cacher']);
+		$this->logger->debug('SCSSCacher::process Lock acquired for '.$lockKey, ['app' => 'scss_cacher']);
 		try {
 			$cached = $this->cache($path, $fileNameCSS, $fileNameSCSS, $folder, $webDir);
 		} catch (\Exception $e) {
@@ -195,7 +195,7 @@ 
 
 		// Cleaning lock
 		$this->lockingCache->remove($lockKey);
-		$this->logger->debug('SCSSCacher::process Lock removed for ' . $lockKey, ['app' => 'scss_cacher']);
+		$this->logger->debug('SCSSCacher::process Lock removed for '.$lockKey, ['app' => 'scss_cacher']);
 
 		// Inject icons vars css if any
 		if ($this->iconsCacher->getCachedCSS() && $this->iconsCacher->getCachedCSS()->getSize() > 0) {
@@ -224,7 +224,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
@@ -248,13 +248,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);
 
@@ -273,7 +273,7 @@ 
 			$this->logger->debug("SCSSCacher::isCached $fileNameCSS is not considered as cached cacheValue: $cacheValue", ['app' => 'scss_cacher']);
 			return false;
 		} catch (NotFoundException $e) {
-			$this->logger->debug("SCSSCacher::isCached NotFoundException " . $e->getMessage(), ['app' => 'scss_cacher']);
+			$this->logger->debug("SCSSCacher::isCached NotFoundException ".$e->getMessage(), ['app' => 'scss_cacher']);
 			return false;
 		}
 	}
@@ -286,7 +286,7 @@ 
 		$cachedVariables = $this->config->getAppValue('core', 'theming.variables', '');
 		$injectedVariables = $this->getInjectedVariables($cachedVariables);
 		if ($cachedVariables !== md5($injectedVariables)) {
-			$this->logger->debug('SCSSCacher::variablesChanged storedVariables: ' . json_encode($this->config->getAppValue('core', 'theming.variables')) . ' currentInjectedVariables: ' . json_encode($injectedVariables), ['app' => 'scss_cacher']);
+			$this->logger->debug('SCSSCacher::variablesChanged storedVariables: '.json_encode($this->config->getAppValue('core', 'theming.variables')).' currentInjectedVariables: '.json_encode($injectedVariables), ['app' => 'scss_cacher']);
 			$this->config->setAppValue('core', 'theming.variables', md5($injectedVariables));
 			$this->resetCache();
 			return true;
@@ -309,7 +309,7 @@ 
 		$scss = new Compiler();
 		$scss->setImportPaths([
 			$path,
-			$this->serverRoot . '/core/css/'
+			$this->serverRoot.'/core/css/'
 		]);
 
 		// Continue after throw
@@ -329,7 +329,7 @@ 
 			$cachedfile = $folder->newFile($fileNameCSS);
 		}
 
-		$depFileName = $fileNameCSS . '.deps';
+		$depFileName = $fileNameCSS.'.deps';
 		try {
 			$depFile = $folder->getFile($depFileName);
 		} catch (NotFoundException $e) {
@@ -339,11 +339,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' => 'scss_cacher']);
 
@@ -355,9 +355,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 {
@@ -365,13 +365,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::cache ' . $webDir . '/' . $fileNameSCSS . ' compiled and successfully cached', ['app' => 'scss_cacher']);
+			$this->logger->debug('SCSSCacher::cache '.$webDir.'/'.$fileNameSCSS.' compiled and successfully cached', ['app' => 'scss_cacher']);
 
 			return true;
 		} catch (NotPermittedException $e) {
-			$this->logger->error('SCSSCacher::cache unable to cache: ' . $fileNameSCSS, ['app' => 'scss_cacher']);
+			$this->logger->error('SCSSCacher::cache unable to cache: '.$fileNameSCSS, ['app' => 'scss_cacher']);
 
 			return false;
 		}
@@ -400,7 +400,7 @@ 
 				try {
 					$file->delete();
 				} catch (NotPermittedException $e) {
-					$this->logger->logException($e, ['message' => 'SCSSCacher::resetCache unable to delete file: ' . $file->getName(), 'app' => 'scss_cacher']);
+					$this->logger->logException($e, ['message' => 'SCSSCacher::resetCache unable to delete file: '.$file->getName(), 'app' => 'scss_cacher']);
 				}
 			}
 		}
@@ -418,7 +418,7 @@ 
 		}
 		$variables = '';
 		foreach ($this->defaults->getScssVariables() as $key => $value) {
-			$variables .= '$' . $key . ': ' . $value . ' !default;';
+			$variables .= '$'.$key.': '.$value.' !default;';
 		}
 
 		/*
@@ -450,7 +450,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);
 	}
@@ -479,12 +479,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;
 		}
@@ -500,11 +500,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;
 	}
 
 	/**
@@ -522,10 +522,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));
 	}
 
 	/**