Inspection of "Merge pull request #52479 from RobertZenz/bugfix/f..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 0d98f9...f9b6b8 )

unknown

created 2025-04-29 07:11 UTC

Status

Indentation +118 added lines, -118 removed lines patch added patch discarded remove patch

@@ -12,122 +12,122 @@
 block discarded – undo
 use Psr\Log\LoggerInterface;
 
 class JSResourceLocator extends ResourceLocator {
-	protected JSCombiner $jsCombiner;
-	protected IAppManager $appManager;
-
-	public function __construct(LoggerInterface $logger, JSCombiner $JSCombiner, IAppManager $appManager) {
-		parent::__construct($logger);
-
-		$this->jsCombiner = $JSCombiner;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * @param string $script
-	 */
-	public function doFind($script) {
-		$theme_dir = 'themes/' . $this->theme . '/';
-
-		// Extracting the appId and the script file name
-		$app = substr($script, 0, strpos($script, '/'));
-		$scriptName = basename($script);
-		// Get the app root path
-		$appRoot = $this->serverroot . '/apps/';
-		$appWebRoot = null;
-		try {
-			// We need the dir name as getAppPath appends the appid
-			$appRoot = dirname($this->appManager->getAppPath($app));
-			// Only do this if $app_path is set, because an empty argument to realpath gets turned into cwd.
-			if ($appRoot) {
-				// Handle symlinks
-				$appRoot = realpath($appRoot);
-			}
-			// Get the app webroot
-			$appWebRoot = dirname($this->appManager->getAppWebPath($app));
-		} catch (AppPathNotFoundException $e) {
-			// ignore
-		}
-
-		if (str_contains($script, '/l10n/')) {
-			// For language files we try to load them all, so themes can overwrite
-			// single l10n strings without having to translate all of them.
-			$found = 0;
-			$found += $this->appendScriptIfExist($this->serverroot, 'core/' . $script);
-			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'core/' . $script);
-			$found += $this->appendScriptIfExist($this->serverroot, $script);
-			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir . $script);
-			$found += $this->appendScriptIfExist($appRoot, $script, $appWebRoot);
-			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script);
-
-			if ($found) {
-				return;
-			}
-		} elseif ($this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script)
-			|| $this->appendScriptIfExist($this->serverroot, $theme_dir . $script)
-			|| $this->appendScriptIfExist($this->serverroot, $script)
-			|| $this->appendScriptIfExist($this->serverroot, $theme_dir . "dist/$app-$scriptName")
-			|| $this->appendScriptIfExist($this->serverroot, "dist/$app-$scriptName")
-			|| $this->appendScriptIfExist($appRoot, $script, $appWebRoot)
-			|| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script . '.json')
-			|| $this->cacheAndAppendCombineJsonIfExist($appRoot, $script . '.json', $app)
-			|| $this->appendScriptIfExist($this->serverroot, $theme_dir . 'core/' . $script)
-			|| $this->appendScriptIfExist($this->serverroot, 'core/' . $script)
-			|| (strpos($scriptName, '/') === -1 && ($this->appendScriptIfExist($this->serverroot, $theme_dir . "dist/core-$scriptName")
-				|| $this->appendScriptIfExist($this->serverroot, "dist/core-$scriptName")))
-			|| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/' . $script . '.json')
-		) {
-			return;
-		}
-
-		// missing translations files will be ignored
-		if (str_contains($script, '/l10n/')) {
-			return;
-		}
-
-		$this->logger->error('Could not find resource {resource} to load', [
-			'resource' => $script . '.js',
-			'app' => 'jsresourceloader',
-		]);
-	}
-
-	/**
-	 * @param string $script
-	 */
-	public function doFindTheme($script) {
-	}
-
-	/**
-	 * Try to find ES6 script file (`.mjs`) with fallback to plain javascript (`.js`)
-	 * @see appendIfExist()
-	 */
-	protected function appendScriptIfExist(string $root, string $file, ?string $webRoot = null) {
-		if (!$this->appendIfExist($root, $file . '.mjs', $webRoot)) {
-			return $this->appendIfExist($root, $file . '.js', $webRoot);
-		}
-		return true;
-	}
-
-	protected function cacheAndAppendCombineJsonIfExist($root, $file, $app = 'core') {
-		if (is_file($root . '/' . $file)) {
-			if ($this->jsCombiner->process($root, $file, $app)) {
-				$this->append($this->serverroot, $this->jsCombiner->getCachedJS($app, $file), false, false);
-			} else {
-				// Add all the files from the json
-				$files = $this->jsCombiner->getContent($root, $file);
-				$app_url = null;
-				try {
-					$app_url = $this->appManager->getAppWebPath($app);
-				} catch (AppPathNotFoundException) {
-					// pass
-				}
-
-				foreach ($files as $jsFile) {
-					$this->append($root, $jsFile, $app_url);
-				}
-			}
-			return true;
-		}
-
-		return false;
-	}
+    protected JSCombiner $jsCombiner;
+    protected IAppManager $appManager;
+
+    public function __construct(LoggerInterface $logger, JSCombiner $JSCombiner, IAppManager $appManager) {
+        parent::__construct($logger);
+
+        $this->jsCombiner = $JSCombiner;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * @param string $script
+     */
+    public function doFind($script) {
+        $theme_dir = 'themes/' . $this->theme . '/';
+
+        // Extracting the appId and the script file name
+        $app = substr($script, 0, strpos($script, '/'));
+        $scriptName = basename($script);
+        // Get the app root path
+        $appRoot = $this->serverroot . '/apps/';
+        $appWebRoot = null;
+        try {
+            // We need the dir name as getAppPath appends the appid
+            $appRoot = dirname($this->appManager->getAppPath($app));
+            // Only do this if $app_path is set, because an empty argument to realpath gets turned into cwd.
+            if ($appRoot) {
+                // Handle symlinks
+                $appRoot = realpath($appRoot);
+            }
+            // Get the app webroot
+            $appWebRoot = dirname($this->appManager->getAppWebPath($app));
+        } catch (AppPathNotFoundException $e) {
+            // ignore
+        }
+
+        if (str_contains($script, '/l10n/')) {
+            // For language files we try to load them all, so themes can overwrite
+            // single l10n strings without having to translate all of them.
+            $found = 0;
+            $found += $this->appendScriptIfExist($this->serverroot, 'core/' . $script);
+            $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'core/' . $script);
+            $found += $this->appendScriptIfExist($this->serverroot, $script);
+            $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . $script);
+            $found += $this->appendScriptIfExist($appRoot, $script, $appWebRoot);
+            $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script);
+
+            if ($found) {
+                return;
+            }
+        } elseif ($this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script)
+            || $this->appendScriptIfExist($this->serverroot, $theme_dir . $script)
+            || $this->appendScriptIfExist($this->serverroot, $script)
+            || $this->appendScriptIfExist($this->serverroot, $theme_dir . "dist/$app-$scriptName")
+            || $this->appendScriptIfExist($this->serverroot, "dist/$app-$scriptName")
+            || $this->appendScriptIfExist($appRoot, $script, $appWebRoot)
+            || $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script . '.json')
+            || $this->cacheAndAppendCombineJsonIfExist($appRoot, $script . '.json', $app)
+            || $this->appendScriptIfExist($this->serverroot, $theme_dir . 'core/' . $script)
+            || $this->appendScriptIfExist($this->serverroot, 'core/' . $script)
+            || (strpos($scriptName, '/') === -1 && ($this->appendScriptIfExist($this->serverroot, $theme_dir . "dist/core-$scriptName")
+                || $this->appendScriptIfExist($this->serverroot, "dist/core-$scriptName")))
+            || $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/' . $script . '.json')
+        ) {
+            return;
+        }
+
+        // missing translations files will be ignored
+        if (str_contains($script, '/l10n/')) {
+            return;
+        }
+
+        $this->logger->error('Could not find resource {resource} to load', [
+            'resource' => $script . '.js',
+            'app' => 'jsresourceloader',
+        ]);
+    }
+
+    /**
+     * @param string $script
+     */
+    public function doFindTheme($script) {
+    }
+
+    /**
+     * Try to find ES6 script file (`.mjs`) with fallback to plain javascript (`.js`)
+     * @see appendIfExist()
+     */
+    protected function appendScriptIfExist(string $root, string $file, ?string $webRoot = null) {
+        if (!$this->appendIfExist($root, $file . '.mjs', $webRoot)) {
+            return $this->appendIfExist($root, $file . '.js', $webRoot);
+        }
+        return true;
+    }
+
+    protected function cacheAndAppendCombineJsonIfExist($root, $file, $app = 'core') {
+        if (is_file($root . '/' . $file)) {
+            if ($this->jsCombiner->process($root, $file, $app)) {
+                $this->append($this->serverroot, $this->jsCombiner->getCachedJS($app, $file), false, false);
+            } else {
+                // Add all the files from the json
+                $files = $this->jsCombiner->getContent($root, $file);
+                $app_url = null;
+                try {
+                    $app_url = $this->appManager->getAppWebPath($app);
+                } catch (AppPathNotFoundException) {
+                    // pass
+                }
+
+                foreach ($files as $jsFile) {
+                    $this->append($root, $jsFile, $app_url);
+                }
+            }
+            return true;
+        }
+
+        return false;
+    }
 }

Please login to merge, or discard this patch.

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -26,13 +26,13 @@  discard block
 block discarded – undo
 	 * @param string $script
 	 */
 	public function doFind($script) {
-		$theme_dir = 'themes/' . $this->theme . '/';
+		$theme_dir = 'themes/'.$this->theme.'/';
 
 		// Extracting the appId and the script file name
 		$app = substr($script, 0, strpos($script, '/'));
 		$scriptName = basename($script);
 		// Get the app root path
-		$appRoot = $this->serverroot . '/apps/';
+		$appRoot = $this->serverroot.'/apps/';
 		$appWebRoot = null;
 		try {
 			// We need the dir name as getAppPath appends the appid
@@ -52,29 +52,29 @@  discard block
 block discarded – undo
 			// For language files we try to load them all, so themes can overwrite
 			// single l10n strings without having to translate all of them.
 			$found = 0;
-			$found += $this->appendScriptIfExist($this->serverroot, 'core/' . $script);
-			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'core/' . $script);
+			$found += $this->appendScriptIfExist($this->serverroot, 'core/'.$script);
+			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'core/'.$script);
 			$found += $this->appendScriptIfExist($this->serverroot, $script);
-			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir . $script);
+			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script);
 			$found += $this->appendScriptIfExist($appRoot, $script, $appWebRoot);
-			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script);
+			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script);
 
 			if ($found) {
 				return;
 			}
-		} elseif ($this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script)
-			|| $this->appendScriptIfExist($this->serverroot, $theme_dir . $script)
+		} elseif ($this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script)
+			|| $this->appendScriptIfExist($this->serverroot, $theme_dir.$script)
 			|| $this->appendScriptIfExist($this->serverroot, $script)
-			|| $this->appendScriptIfExist($this->serverroot, $theme_dir . "dist/$app-$scriptName")
+			|| $this->appendScriptIfExist($this->serverroot, $theme_dir."dist/$app-$scriptName")
 			|| $this->appendScriptIfExist($this->serverroot, "dist/$app-$scriptName")
 			|| $this->appendScriptIfExist($appRoot, $script, $appWebRoot)
-			|| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script . '.json')
-			|| $this->cacheAndAppendCombineJsonIfExist($appRoot, $script . '.json', $app)
-			|| $this->appendScriptIfExist($this->serverroot, $theme_dir . 'core/' . $script)
-			|| $this->appendScriptIfExist($this->serverroot, 'core/' . $script)
-			|| (strpos($scriptName, '/') === -1 && ($this->appendScriptIfExist($this->serverroot, $theme_dir . "dist/core-$scriptName")
+			|| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script.'.json')
+			|| $this->cacheAndAppendCombineJsonIfExist($appRoot, $script.'.json', $app)
+			|| $this->appendScriptIfExist($this->serverroot, $theme_dir.'core/'.$script)
+			|| $this->appendScriptIfExist($this->serverroot, 'core/'.$script)
+			|| (strpos($scriptName, '/') === -1 && ($this->appendScriptIfExist($this->serverroot, $theme_dir."dist/core-$scriptName")
 				|| $this->appendScriptIfExist($this->serverroot, "dist/core-$scriptName")))
-			|| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/' . $script . '.json')
+			|| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/'.$script.'.json')
 		) {
 			return;
 		}
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
 		}
 
 		$this->logger->error('Could not find resource {resource} to load', [
-			'resource' => $script . '.js',
+			'resource' => $script.'.js',
 			'app' => 'jsresourceloader',
 		]);
 	}
@@ -101,14 +101,14 @@  discard block
 block discarded – undo
 	 * @see appendIfExist()
 	 */
 	protected function appendScriptIfExist(string $root, string $file, ?string $webRoot = null) {
-		if (!$this->appendIfExist($root, $file . '.mjs', $webRoot)) {
-			return $this->appendIfExist($root, $file . '.js', $webRoot);
+		if (!$this->appendIfExist($root, $file.'.mjs', $webRoot)) {
+			return $this->appendIfExist($root, $file.'.js', $webRoot);
 		}
 		return true;
 	}
 
 	protected function cacheAndAppendCombineJsonIfExist($root, $file, $app = 'core') {
-		if (is_file($root . '/' . $file)) {
+		if (is_file($root.'/'.$file)) {
 			if ($this->jsCombiner->process($root, $file, $app)) {
 				$this->append($this->serverroot, $this->jsCombiner->getCachedJS($app, $file), false, false);
 			} else {

Please login to merge, or discard this patch.

		@@ -26,13 +26,13 @@ discard block
		block discarded – undo
26	26	* @param string $script
27	27	*/
28	28	public function doFind($script) {
29		- $theme_dir = 'themes/' . $this->theme . '/';
	29	+ $theme_dir = 'themes/'.$this->theme.'/';
30	30
31	31	// Extracting the appId and the script file name
32	32	$app = substr($script, 0, strpos($script, '/'));
33	33	$scriptName = basename($script);
34	34	// Get the app root path
35		- $appRoot = $this->serverroot . '/apps/';
	35	+ $appRoot = $this->serverroot.'/apps/';
36	36	$appWebRoot = null;
37	37	try {
38	38	// We need the dir name as getAppPath appends the appid
		@@ -52,29 +52,29 @@ discard block
		block discarded – undo
52	52	// For language files we try to load them all, so themes can overwrite
53	53	// single l10n strings without having to translate all of them.
54	54	$found = 0;
55		- $found += $this->appendScriptIfExist($this->serverroot, 'core/' . $script);
56		- $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'core/' . $script);
	55	+ $found += $this->appendScriptIfExist($this->serverroot, 'core/'.$script);
	56	+ $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'core/'.$script);
57	57	$found += $this->appendScriptIfExist($this->serverroot, $script);
58		- $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . $script);
	58	+ $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script);
59	59	$found += $this->appendScriptIfExist($appRoot, $script, $appWebRoot);
60		- $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script);
	60	+ $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script);
61	61
62	62	if ($found) {
63	63	return;
64	64	}
65		- } elseif ($this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script)
66		- \|\| $this->appendScriptIfExist($this->serverroot, $theme_dir . $script)
	65	+ } elseif ($this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script)
	66	+ \|\| $this->appendScriptIfExist($this->serverroot, $theme_dir.$script)
67	67	\|\| $this->appendScriptIfExist($this->serverroot, $script)
68		- \|\| $this->appendScriptIfExist($this->serverroot, $theme_dir . "dist/$app-$scriptName")
	68	+ \|\| $this->appendScriptIfExist($this->serverroot, $theme_dir."dist/$app-$scriptName")
69	69	\|\| $this->appendScriptIfExist($this->serverroot, "dist/$app-$scriptName")
70	70	\|\| $this->appendScriptIfExist($appRoot, $script, $appWebRoot)
71		- \|\| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script . '.json')
72		- \|\| $this->cacheAndAppendCombineJsonIfExist($appRoot, $script . '.json', $app)
73		- \|\| $this->appendScriptIfExist($this->serverroot, $theme_dir . 'core/' . $script)
74		- \|\| $this->appendScriptIfExist($this->serverroot, 'core/' . $script)
75		- \|\| (strpos($scriptName, '/') === -1 && ($this->appendScriptIfExist($this->serverroot, $theme_dir . "dist/core-$scriptName")
	71	+ \|\| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script.'.json')
	72	+ \|\| $this->cacheAndAppendCombineJsonIfExist($appRoot, $script.'.json', $app)
	73	+ \|\| $this->appendScriptIfExist($this->serverroot, $theme_dir.'core/'.$script)
	74	+ \|\| $this->appendScriptIfExist($this->serverroot, 'core/'.$script)
	75	+ \|\| (strpos($scriptName, '/') === -1 && ($this->appendScriptIfExist($this->serverroot, $theme_dir."dist/core-$scriptName")
76	76	\|\| $this->appendScriptIfExist($this->serverroot, "dist/core-$scriptName")))
77		- \|\| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/' . $script . '.json')
	77	+ \|\| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/'.$script.'.json')
78	78	) {
79	79	return;
80	80	}
		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85	}
86	86
87	87	$this->logger->error('Could not find resource {resource} to load', [
88		- 'resource' => $script . '.js',
	88	+ 'resource' => $script.'.js',
89	89	'app' => 'jsresourceloader',
90	90	]);
91	91	}
		@@ -101,14 +101,14 @@ discard block
		block discarded – undo
101	101	* @see appendIfExist()
102	102	*/
103	103	protected function appendScriptIfExist(string $root, string $file, ?string $webRoot = null) {
104		- if (!$this->appendIfExist($root, $file . '.mjs', $webRoot)) {
105		- return $this->appendIfExist($root, $file . '.js', $webRoot);
	104	+ if (!$this->appendIfExist($root, $file.'.mjs', $webRoot)) {
	105	+ return $this->appendIfExist($root, $file.'.js', $webRoot);
106	106	}
107	107	return true;
108	108	}
109	109
110	110	protected function cacheAndAppendCombineJsonIfExist($root, $file, $app = 'core') {
111		- if (is_file($root . '/' . $file)) {
	111	+ if (is_file($root.'/'.$file)) {
112	112	if ($this->jsCombiner->process($root, $file, $app)) {
113	113	$this->append($this->serverroot, $this->jsCombiner->getCachedJS($app, $file), false, false);
114	114	} else {

		@@ -12,122 +12,122 @@
		block discarded – undo
12	12	use Psr\Log\LoggerInterface;
13	13
14	14	class JSResourceLocator extends ResourceLocator {
15		- protected JSCombiner $jsCombiner;
16		- protected IAppManager $appManager;
17		-
18		- public function __construct(LoggerInterface $logger, JSCombiner $JSCombiner, IAppManager $appManager) {
19		- parent::__construct($logger);
20		-
21		- $this->jsCombiner = $JSCombiner;
22		- $this->appManager = $appManager;
23		- }
24		-
25		- /**
26		- * @param string $script
27		- */
28		- public function doFind($script) {
29		- $theme_dir = 'themes/' . $this->theme . '/';
30		-
31		- // Extracting the appId and the script file name
32		- $app = substr($script, 0, strpos($script, '/'));
33		- $scriptName = basename($script);
34		- // Get the app root path
35		- $appRoot = $this->serverroot . '/apps/';
36		- $appWebRoot = null;
37		- try {
38		- // We need the dir name as getAppPath appends the appid
39		- $appRoot = dirname($this->appManager->getAppPath($app));
40		- // Only do this if $app_path is set, because an empty argument to realpath gets turned into cwd.
41		- if ($appRoot) {
42		- // Handle symlinks
43		- $appRoot = realpath($appRoot);
44		- }
45		- // Get the app webroot
46		- $appWebRoot = dirname($this->appManager->getAppWebPath($app));
47		- } catch (AppPathNotFoundException $e) {
48		- // ignore
49		- }
50		-
51		- if (str_contains($script, '/l10n/')) {
52		- // For language files we try to load them all, so themes can overwrite
53		- // single l10n strings without having to translate all of them.
54		- $found = 0;
55		- $found += $this->appendScriptIfExist($this->serverroot, 'core/' . $script);
56		- $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'core/' . $script);
57		- $found += $this->appendScriptIfExist($this->serverroot, $script);
58		- $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . $script);
59		- $found += $this->appendScriptIfExist($appRoot, $script, $appWebRoot);
60		- $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script);
61		-
62		- if ($found) {
63		- return;
64		- }
65		- } elseif ($this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script)
66		- \|\| $this->appendScriptIfExist($this->serverroot, $theme_dir . $script)
67		- \|\| $this->appendScriptIfExist($this->serverroot, $script)
68		- \|\| $this->appendScriptIfExist($this->serverroot, $theme_dir . "dist/$app-$scriptName")
69		- \|\| $this->appendScriptIfExist($this->serverroot, "dist/$app-$scriptName")
70		- \|\| $this->appendScriptIfExist($appRoot, $script, $appWebRoot)
71		- \|\| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script . '.json')
72		- \|\| $this->cacheAndAppendCombineJsonIfExist($appRoot, $script . '.json', $app)
73		- \|\| $this->appendScriptIfExist($this->serverroot, $theme_dir . 'core/' . $script)
74		- \|\| $this->appendScriptIfExist($this->serverroot, 'core/' . $script)
75		- \|\| (strpos($scriptName, '/') === -1 && ($this->appendScriptIfExist($this->serverroot, $theme_dir . "dist/core-$scriptName")
76		- \|\| $this->appendScriptIfExist($this->serverroot, "dist/core-$scriptName")))
77		- \|\| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/' . $script . '.json')
78		- ) {
79		- return;
80		- }
81		-
82		- // missing translations files will be ignored
83		- if (str_contains($script, '/l10n/')) {
84		- return;
85		- }
86		-
87		- $this->logger->error('Could not find resource {resource} to load', [
88		- 'resource' => $script . '.js',
89		- 'app' => 'jsresourceloader',
90		- ]);
91		- }
92		-
93		- /**
94		- * @param string $script
95		- */
96		- public function doFindTheme($script) {
97		- }
98		-
99		- /**
100		- * Try to find ES6 script file (`.mjs`) with fallback to plain javascript (`.js`)
101		- * @see appendIfExist()
102		- */
103		- protected function appendScriptIfExist(string $root, string $file, ?string $webRoot = null) {
104		- if (!$this->appendIfExist($root, $file . '.mjs', $webRoot)) {
105		- return $this->appendIfExist($root, $file . '.js', $webRoot);
106		- }
107		- return true;
108		- }
109		-
110		- protected function cacheAndAppendCombineJsonIfExist($root, $file, $app = 'core') {
111		- if (is_file($root . '/' . $file)) {
112		- if ($this->jsCombiner->process($root, $file, $app)) {
113		- $this->append($this->serverroot, $this->jsCombiner->getCachedJS($app, $file), false, false);
114		- } else {
115		- // Add all the files from the json
116		- $files = $this->jsCombiner->getContent($root, $file);
117		- $app_url = null;
118		- try {
119		- $app_url = $this->appManager->getAppWebPath($app);
120		- } catch (AppPathNotFoundException) {
121		- // pass
122		- }
123		-
124		- foreach ($files as $jsFile) {
125		- $this->append($root, $jsFile, $app_url);
126		- }
127		- }
128		- return true;
129		- }
130		-
131		- return false;
132		- }
	15	+ protected JSCombiner $jsCombiner;
	16	+ protected IAppManager $appManager;
	17	+
	18	+ public function __construct(LoggerInterface $logger, JSCombiner $JSCombiner, IAppManager $appManager) {
	19	+ parent::__construct($logger);
	20	+
	21	+ $this->jsCombiner = $JSCombiner;
	22	+ $this->appManager = $appManager;
	23	+ }
	24	+
	25	+ /**
	26	+ * @param string $script
	27	+ */
	28	+ public function doFind($script) {
	29	+ $theme_dir = 'themes/' . $this->theme . '/';
	30	+
	31	+ // Extracting the appId and the script file name
	32	+ $app = substr($script, 0, strpos($script, '/'));
	33	+ $scriptName = basename($script);
	34	+ // Get the app root path
	35	+ $appRoot = $this->serverroot . '/apps/';
	36	+ $appWebRoot = null;
	37	+ try {
	38	+ // We need the dir name as getAppPath appends the appid
	39	+ $appRoot = dirname($this->appManager->getAppPath($app));
	40	+ // Only do this if $app_path is set, because an empty argument to realpath gets turned into cwd.
	41	+ if ($appRoot) {
	42	+ // Handle symlinks
	43	+ $appRoot = realpath($appRoot);
	44	+ }
	45	+ // Get the app webroot
	46	+ $appWebRoot = dirname($this->appManager->getAppWebPath($app));
	47	+ } catch (AppPathNotFoundException $e) {
	48	+ // ignore
	49	+ }
	50	+
	51	+ if (str_contains($script, '/l10n/')) {
	52	+ // For language files we try to load them all, so themes can overwrite
	53	+ // single l10n strings without having to translate all of them.
	54	+ $found = 0;
	55	+ $found += $this->appendScriptIfExist($this->serverroot, 'core/' . $script);
	56	+ $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'core/' . $script);
	57	+ $found += $this->appendScriptIfExist($this->serverroot, $script);
	58	+ $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . $script);
	59	+ $found += $this->appendScriptIfExist($appRoot, $script, $appWebRoot);
	60	+ $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script);
	61	+
	62	+ if ($found) {
	63	+ return;
	64	+ }
	65	+ } elseif ($this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script)
	66	+ \|\| $this->appendScriptIfExist($this->serverroot, $theme_dir . $script)
	67	+ \|\| $this->appendScriptIfExist($this->serverroot, $script)
	68	+ \|\| $this->appendScriptIfExist($this->serverroot, $theme_dir . "dist/$app-$scriptName")
	69	+ \|\| $this->appendScriptIfExist($this->serverroot, "dist/$app-$scriptName")
	70	+ \|\| $this->appendScriptIfExist($appRoot, $script, $appWebRoot)
	71	+ \|\| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script . '.json')
	72	+ \|\| $this->cacheAndAppendCombineJsonIfExist($appRoot, $script . '.json', $app)
	73	+ \|\| $this->appendScriptIfExist($this->serverroot, $theme_dir . 'core/' . $script)
	74	+ \|\| $this->appendScriptIfExist($this->serverroot, 'core/' . $script)
	75	+ \|\| (strpos($scriptName, '/') === -1 && ($this->appendScriptIfExist($this->serverroot, $theme_dir . "dist/core-$scriptName")
	76	+ \|\| $this->appendScriptIfExist($this->serverroot, "dist/core-$scriptName")))
	77	+ \|\| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/' . $script . '.json')
	78	+ ) {
	79	+ return;
	80	+ }
	81	+
	82	+ // missing translations files will be ignored
	83	+ if (str_contains($script, '/l10n/')) {
	84	+ return;
	85	+ }
	86	+
	87	+ $this->logger->error('Could not find resource {resource} to load', [
	88	+ 'resource' => $script . '.js',
	89	+ 'app' => 'jsresourceloader',
	90	+ ]);
	91	+ }
	92	+
	93	+ /**
	94	+ * @param string $script
	95	+ */
	96	+ public function doFindTheme($script) {
	97	+ }
	98	+
	99	+ /**
	100	+ * Try to find ES6 script file (`.mjs`) with fallback to plain javascript (`.js`)
	101	+ * @see appendIfExist()
	102	+ */
	103	+ protected function appendScriptIfExist(string $root, string $file, ?string $webRoot = null) {
	104	+ if (!$this->appendIfExist($root, $file . '.mjs', $webRoot)) {
	105	+ return $this->appendIfExist($root, $file . '.js', $webRoot);
	106	+ }
	107	+ return true;
	108	+ }
	109	+
	110	+ protected function cacheAndAppendCombineJsonIfExist($root, $file, $app = 'core') {
	111	+ if (is_file($root . '/' . $file)) {
	112	+ if ($this->jsCombiner->process($root, $file, $app)) {
	113	+ $this->append($this->serverroot, $this->jsCombiner->getCachedJS($app, $file), false, false);
	114	+ } else {
	115	+ // Add all the files from the json
	116	+ $files = $this->jsCombiner->getContent($root, $file);
	117	+ $app_url = null;
	118	+ try {
	119	+ $app_url = $this->appManager->getAppWebPath($app);
	120	+ } catch (AppPathNotFoundException) {
	121	+ // pass
	122	+ }
	123	+
	124	+ foreach ($files as $jsFile) {
	125	+ $this->append($root, $jsFile, $app_url);
	126	+ }
	127	+ }
	128	+ return true;
	129	+ }
	130	+
	131	+ return false;
	132	+ }
133	133	}

nextcloud / server

Push — master ( 0d98f9...f9b6b8 )

Status

Category

Indentation +118 added lines, -118 removed lines patch added patch discarded remove patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch