nextcloud / server

lib/private/Template/CSSResourceLocator.php

Indentation +66 added lines, -66 removed lines

@@ -16,78 +16,78 @@
 use Psr\Log\LoggerInterface;
 
 class CSSResourceLocator extends ResourceLocator {
-	public function __construct(
-		LoggerInterface $logger,
-		IConfig $config,
-		protected IAppManager $appManager,
-	) {
-		parent::__construct($logger, $config);
-	}
+    public function __construct(
+        LoggerInterface $logger,
+        IConfig $config,
+        protected IAppManager $appManager,
+    ) {
+        parent::__construct($logger, $config);
+    }
 
-	public function doFind(string $resource): void {
-		$parts = explode('/', $resource);
-		if (count($parts) < 2) {
-			return;
-		}
-		$app = $parts[0];
-		$filename = $parts[array_key_last($parts)];
-		if ($this->appendIfExist($this->serverroot, $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, 'core/' . $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, 'dist/' . $app . '-' . $filename . '.css')
-		) {
-			return;
-		}
-		try {
-			$app_path = $this->appManager->getAppPath($app);
-			$app_url = $this->appManager->getAppWebPath($app);
-		} catch (AppPathNotFoundException $e) {
-			$this->logger->error('Could not find resource {resource} to load', [
-				'resource' => $resource . '.css',
-				'app' => 'cssresourceloader',
-				'exception' => $e,
-			]);
-			return;
-		}
+    public function doFind(string $resource): void {
+        $parts = explode('/', $resource);
+        if (count($parts) < 2) {
+            return;
+        }
+        $app = $parts[0];
+        $filename = $parts[array_key_last($parts)];
+        if ($this->appendIfExist($this->serverroot, $resource . '.css')
+            || $this->appendIfExist($this->serverroot, 'core/' . $resource . '.css')
+            || $this->appendIfExist($this->serverroot, 'dist/' . $app . '-' . $filename . '.css')
+        ) {
+            return;
+        }
+        try {
+            $app_path = $this->appManager->getAppPath($app);
+            $app_url = $this->appManager->getAppWebPath($app);
+        } catch (AppPathNotFoundException $e) {
+            $this->logger->error('Could not find resource {resource} to load', [
+                'resource' => $resource . '.css',
+                'app' => 'cssresourceloader',
+                'exception' => $e,
+            ]);
+            return;
+        }
 
-		// Account for the possibility of having symlinks in app path. Doing
-		// this here instead of above as an empty argument to realpath gets
-		// turned into cwd.
-		$app_path = realpath($app_path);
+        // Account for the possibility of having symlinks in app path. Doing
+        // this here instead of above as an empty argument to realpath gets
+        // turned into cwd.
+        $app_path = realpath($app_path);
 
-		$this->append($app_path, join('/', array_slice($parts, 1)) . '.css', $app_url);
-	}
+        $this->append($app_path, join('/', array_slice($parts, 1)) . '.css', $app_url);
+    }
 
-	public function doFindTheme(string $resource): void {
-		$theme_dir = 'themes/' . $this->theme . '/';
-		$this->appendIfExist($this->serverroot, $theme_dir . 'apps/' . $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, $theme_dir . $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, $theme_dir . 'core/' . $resource . '.css');
-	}
+    public function doFindTheme(string $resource): void {
+        $theme_dir = 'themes/' . $this->theme . '/';
+        $this->appendIfExist($this->serverroot, $theme_dir . 'apps/' . $resource . '.css')
+            || $this->appendIfExist($this->serverroot, $theme_dir . $resource . '.css')
+            || $this->appendIfExist($this->serverroot, $theme_dir . 'core/' . $resource . '.css');
+    }
 
-	public function append(string $root, string $file, ?string $webRoot = null, bool $throw = true, bool $scss = false): void {
-		if (!$scss) {
-			parent::append($root, $file, $webRoot, $throw);
-		} else {
-			if ($webRoot === null || $webRoot === '') {
-				$webRoot = $this->findWebRoot($root);
+    public function append(string $root, string $file, ?string $webRoot = null, bool $throw = true, bool $scss = false): void {
+        if (!$scss) {
+            parent::append($root, $file, $webRoot, $throw);
+        } else {
+            if ($webRoot === null || $webRoot === '') {
+                $webRoot = $this->findWebRoot($root);
 
-				if ($webRoot === null) {
-					$webRoot = '';
-					$this->logger->error('ResourceLocator can not find a web root (root: {root}, file: {file}, webRoot: {webRoot}, throw: {throw})', [
-						'app' => 'lib',
-						'root' => $root,
-						'file' => $file,
-						'webRoot' => $webRoot,
-						'throw' => $throw ? 'true' : 'false'
-					]);
+                if ($webRoot === null) {
+                    $webRoot = '';
+                    $this->logger->error('ResourceLocator can not find a web root (root: {root}, file: {file}, webRoot: {webRoot}, throw: {throw})', [
+                        'app' => 'lib',
+                        'root' => $root,
+                        'file' => $file,
+                        'webRoot' => $webRoot,
+                        'throw' => $throw ? 'true' : 'false'
+                    ]);
 
-					if ($throw && $root === '/') {
-						throw new ResourceNotFoundException($file, $webRoot);
-					}
-				}
-			}
+                    if ($throw && $root === '/') {
+                        throw new ResourceNotFoundException($file, $webRoot);
+                    }
+                }
+            }
 
-			$this->resources[] = [$webRoot ?: \OC::$WEBROOT, $webRoot, $file];
-		}
-	}
+            $this->resources[] = [$webRoot ?: \OC::$WEBROOT, $webRoot, $file];
+        }
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -31,9 +31,9 @@ 
 		}
 		$app = $parts[0];
 		$filename = $parts[array_key_last($parts)];
-		if ($this->appendIfExist($this->serverroot, $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, 'core/' . $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, 'dist/' . $app . '-' . $filename . '.css')
+		if ($this->appendIfExist($this->serverroot, $resource.'.css')
+			|| $this->appendIfExist($this->serverroot, 'core/'.$resource.'.css')
+			|| $this->appendIfExist($this->serverroot, 'dist/'.$app.'-'.$filename.'.css')
 		) {
 			return;
 		}
@@ -42,7 +42,7 @@ 
 			$app_url = $this->appManager->getAppWebPath($app);
 		} catch (AppPathNotFoundException $e) {
 			$this->logger->error('Could not find resource {resource} to load', [
-				'resource' => $resource . '.css',
+				'resource' => $resource.'.css',
 				'app' => 'cssresourceloader',
 				'exception' => $e,
 			]);
@@ -54,14 +54,14 @@ 
 		// turned into cwd.
 		$app_path = realpath($app_path);
 
-		$this->append($app_path, join('/', array_slice($parts, 1)) . '.css', $app_url);
+		$this->append($app_path, join('/', array_slice($parts, 1)).'.css', $app_url);
 	}
 
 	public function doFindTheme(string $resource): void {
-		$theme_dir = 'themes/' . $this->theme . '/';
-		$this->appendIfExist($this->serverroot, $theme_dir . 'apps/' . $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, $theme_dir . $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, $theme_dir . 'core/' . $resource . '.css');
+		$theme_dir = 'themes/'.$this->theme.'/';
+		$this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$resource.'.css')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.$resource.'.css')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$resource.'.css');
 	}
 
 	public function append(string $root, string $file, ?string $webRoot = null, bool $throw = true, bool $scss = false): void {

apps/sharebymail/lib/Settings/Admin.php

Indentation +46 added lines, -46 removed lines

@@ -12,50 +12,50 @@
 use OCP\Settings\IDelegatedSettings;
 
 class Admin implements IDelegatedSettings {
-	public function __construct(
-		private SettingsManager $settingsManager,
-		private IL10N $l,
-		private IInitialState $initialState,
-	) {
-	}
-
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$this->initialState->provideInitialState('sendPasswordMail', $this->settingsManager->sendPasswordByMail());
-		$this->initialState->provideInitialState('replyToInitiator', $this->settingsManager->replyToInitiator());
-
-		\OCP\Util::addStyle('sharebymail', 'admin-settings');
-		\OCP\Util::addScript('sharebymail', 'admin-settings');
-		return new TemplateResponse('sharebymail', 'settings-admin', [], '');
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'sharing';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 *             the admin section. The forms are arranged in ascending order of the
-	 *             priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 40;
-	}
-
-	public function getName(): ?string {
-		return $this->l->t('Share by mail');
-	}
-
-	public function getAuthorizedAppConfig(): array {
-		return [
-			'sharebymail' => ['s/(sendpasswordmail|replyToInitiator)/'],
-		];
-	}
+    public function __construct(
+        private SettingsManager $settingsManager,
+        private IL10N $l,
+        private IInitialState $initialState,
+    ) {
+    }
+
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $this->initialState->provideInitialState('sendPasswordMail', $this->settingsManager->sendPasswordByMail());
+        $this->initialState->provideInitialState('replyToInitiator', $this->settingsManager->replyToInitiator());
+
+        \OCP\Util::addStyle('sharebymail', 'admin-settings');
+        \OCP\Util::addScript('sharebymail', 'admin-settings');
+        return new TemplateResponse('sharebymail', 'settings-admin', [], '');
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'sharing';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     *             the admin section. The forms are arranged in ascending order of the
+     *             priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 40;
+    }
+
+    public function getName(): ?string {
+        return $this->l->t('Share by mail');
+    }
+
+    public function getAuthorizedAppConfig(): array {
+        return [
+            'sharebymail' => ['s/(sendpasswordmail|replyToInitiator)/'],
+        ];
+    }
 }

build/files-checker.php

Indentation +90 added lines, -90 removed lines

@@ -7,93 +7,93 @@ 
  */
 
 $expectedFiles = [
-	'.',
-	'..',
-	'.devcontainer',
-	'.editorconfig',
-	'.envrc',
-	'.git',
-	'.git-blame-ignore-revs',
-	'.gitattributes',
-	'.github',
-	'.gitignore',
-	'.gitmodules',
-	'.htaccess',
-	'.idea',
-	'.jshintrc',
-	'.mailmap',
-	'.npmignore',
-	'.php-cs-fixer.dist.php',
-	'.pre-commit-config.yaml',
-	'.tag',
-	'.tx',
-	'.user.ini',
-	'__mocks__',
-	'__tests__',
-	'3rdparty',
-	'AUTHORS',
-	'CHANGELOG.md',
-	'CODE_OF_CONDUCT.md',
-	'COPYING',
-	'COPYING-README',
-	'DESIGN.md',
-	'Makefile',
-	'README.md',
-	'REUSE.toml',
-	'SECURITY.md',
-	'apps',
-	'autotest-checkers.sh',
-	'autotest-external.sh',
-	'autotest.sh',
-	'build',
-	'codecov.yml',
-	'composer.json',
-	'composer.lock',
-	'config',
-	'console.php',
-	'contribute',
-	'core',
-	'cron.php',
-	'custom.d.ts',
-	'cypress.config.ts',
-	'cypress',
-	'dist',
-	'eslint.config.js',
-	'flake.lock',
-	'flake.nix',
-	'index.html',
-	'index.php',
-	'lib',
-	'LICENSES',
-	'occ',
-	'ocs',
-	'ocs-provider',
-	'openapi.json',
-	'package-lock.json',
-	'package.json',
-	'psalm-ncu.xml',
-	'psalm-ocp.xml',
-	'psalm.xml',
-	'public.php',
-	'remote.php',
-	'resources',
-	'robots.txt',
-	'status.php',
-	'stylelint.config.js',
-	'tests',
-	'themes',
-	'tsconfig.json',
-	'vendor-bin',
-	'version.php',
-	'vite.config.ts',
-	'vitest.config.ts',
-	'window.d.ts',
+    '.',
+    '..',
+    '.devcontainer',
+    '.editorconfig',
+    '.envrc',
+    '.git',
+    '.git-blame-ignore-revs',
+    '.gitattributes',
+    '.github',
+    '.gitignore',
+    '.gitmodules',
+    '.htaccess',
+    '.idea',
+    '.jshintrc',
+    '.mailmap',
+    '.npmignore',
+    '.php-cs-fixer.dist.php',
+    '.pre-commit-config.yaml',
+    '.tag',
+    '.tx',
+    '.user.ini',
+    '__mocks__',
+    '__tests__',
+    '3rdparty',
+    'AUTHORS',
+    'CHANGELOG.md',
+    'CODE_OF_CONDUCT.md',
+    'COPYING',
+    'COPYING-README',
+    'DESIGN.md',
+    'Makefile',
+    'README.md',
+    'REUSE.toml',
+    'SECURITY.md',
+    'apps',
+    'autotest-checkers.sh',
+    'autotest-external.sh',
+    'autotest.sh',
+    'build',
+    'codecov.yml',
+    'composer.json',
+    'composer.lock',
+    'config',
+    'console.php',
+    'contribute',
+    'core',
+    'cron.php',
+    'custom.d.ts',
+    'cypress.config.ts',
+    'cypress',
+    'dist',
+    'eslint.config.js',
+    'flake.lock',
+    'flake.nix',
+    'index.html',
+    'index.php',
+    'lib',
+    'LICENSES',
+    'occ',
+    'ocs',
+    'ocs-provider',
+    'openapi.json',
+    'package-lock.json',
+    'package.json',
+    'psalm-ncu.xml',
+    'psalm-ocp.xml',
+    'psalm.xml',
+    'public.php',
+    'remote.php',
+    'resources',
+    'robots.txt',
+    'status.php',
+    'stylelint.config.js',
+    'tests',
+    'themes',
+    'tsconfig.json',
+    'vendor-bin',
+    'version.php',
+    'vite.config.ts',
+    'vitest.config.ts',
+    'window.d.ts',
 ];
 $actualFiles = [];
 
 $files = new \DirectoryIterator(__DIR__ . '/..');
 foreach ($files as $file) {
-	$actualFiles[] = $file->getFilename();
+    $actualFiles[] = $file->getFilename();
 }
 
 $additionalFiles = array_diff($actualFiles, $expectedFiles);
@@ -101,19 +101,19 @@ 
 
 $failed = false;
 if (count($additionalFiles) > 0) {
-	echo sprintf('ERROR: There were %d additional files:', count($additionalFiles)) . PHP_EOL;
-	echo implode(PHP_EOL, $additionalFiles) . PHP_EOL;
-	$failed = true;
+    echo sprintf('ERROR: There were %d additional files:', count($additionalFiles)) . PHP_EOL;
+    echo implode(PHP_EOL, $additionalFiles) . PHP_EOL;
+    $failed = true;
 }
 if (count($missingFiles) > 0) {
-	echo sprintf('ERROR: There were %d missing files:', count($missingFiles)) . PHP_EOL;
-	echo implode(PHP_EOL, $missingFiles) . PHP_EOL;
-	$failed = true;
+    echo sprintf('ERROR: There were %d missing files:', count($missingFiles)) . PHP_EOL;
+    echo implode(PHP_EOL, $missingFiles) . PHP_EOL;
+    $failed = true;
 }
 
 if ($failed) {
-	echo 'ERROR: Please remove or add those files again or inform the release team about those now files to be included or excluded from the release tar ball.' . PHP_EOL;
-	exit(1);
+    echo 'ERROR: Please remove or add those files again or inform the release team about those now files to be included or excluded from the release tar ball.' . PHP_EOL;
+    exit(1);
 }
 
 echo 'OK: all expected files are present and no additional files are there.' . PHP_EOL;