Fixed webroot for scss files

Fixed tests

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

Author: skjnldsv

lib/private/Template/CSSResourceLocator.php

@@ -108,7 +108,7 @@ protected function cacheAndAppendScssIfExist($root, $file, $app = 'core') {
 			if($this->scssCacher !== null) {
 				if($this->scssCacher->process($root, $file, $app)) {
 
-					$this->append($root, $this->scssCacher->getCachedSCSS($app, $file), false, true, true);
+					$this->append($root, $this->scssCacher->getCachedSCSS($app, $file), \OC::$WEBROOT, true, true);
 					return true;
 				} else {
 					$this->logger->warning('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']);
@@ -145,7 +145,7 @@ public function append($root, $file, $webRoot = null, $throw = true, $scss = fal
 				}
 			}
 
-			$this->resources[] = array($webRoot? : '/', $webRoot, $file);
+			$this->resources[] = array($webRoot? : \OC::$WEBROOT, $webRoot, $file);
 		}
 	}
 }

lib/private/Template/SCSSCacher.php

@@ -102,16 +102,19 @@ public function process($root, $file, $app) {
 		$fileNameCSS = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS));
 
 		$path = implode('/', $path);
+		$webDir = null;
 
 		// Detect if path is within an app path
 		$app_paths = $this->config->getSystemValue('apps_paths');
-		foreach ($app_paths as $app_path) {
-			if(strpos($path, $app_path["path"]) === 0) {
-				$webDir = $app_path["url"].str_replace($app_path["path"], '', $path);
-				break;
+		if (!empty($app_paths)) {
+			foreach ($app_paths as $app_path) {
+				if (strpos($path, $app_path["path"]) === 0) {
+					$webDir = $app_path["url"].str_replace($app_path["path"], '', $path);
+					break;
+				}
 			}
 		}
-		if(is_null($webDir)) {
+		if (is_null($webDir)) {
 			$webDir = substr($path, strlen($this->serverRoot));
 		}
 
@@ -165,7 +168,7 @@ private function isCached($fileNameCSS, ISimpleFolder $folder) {
 					}
 				}
 			}
-			return false;
+			return true;
 		} catch(NotFoundException $e) {
 			return false;
 		}
@@ -304,7 +307,6 @@ private function rebaseUrls($css, $webDir) {
 	 * @return string
 	 */
 	public function getCachedSCSS($appName, $fileName) {
-		//var_dump([$appName, $fileName]);
 		$tmpfileLoc = explode('/', $fileName);
 		$fileName = array_pop($tmpfileLoc);
 		$fileName = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileName));

tests/lib/Template/SCSSCacherTest.php

@@ -352,19 +352,10 @@ public function testCacheFailure() {
 	}
 
 	public function testRebaseUrls() {
-		$webDir = 'apps/files/css';
+		$webDir = '/apps/files/css';
 		$css = '#id { background-image: url(\'../img/image.jpg\'); }';
 		$actual = self::invokePrivate($this->scssCacher, 'rebaseUrls', [$css, $webDir]);
-		$expected = '#id { background-image: url(\'../../../apps/files/css/../img/image.jpg\'); }';
-		$this->assertEquals($expected, $actual);
-	}
-
-	public function testRebaseUrlsIgnoreFrontendController() {
-		$this->config->expects($this->once())->method('getSystemValue')->with('htaccess.IgnoreFrontController', false)->willReturn(true);
-		$webDir = 'apps/files/css';
-		$css = '#id { background-image: url(\'../img/image.jpg\'); }';
-		$actual = self::invokePrivate($this->scssCacher, 'rebaseUrls', [$css, $webDir]);
-		$expected = '#id { background-image: url(\'../../apps/files/css/../img/image.jpg\'); }';
+		$expected = '#id { background-image: url(\'/apps/files/css/../img/image.jpg\'); }';
 		$this->assertEquals($expected, $actual);
 	}