nextcloud / server

lib/private/Accounts/TAccountsHelper.php

Indentation +12 added lines, -12 removed lines

@@ -29,16 +29,16 @@
 use OCP\Accounts\IAccountManager;
 
 trait TAccountsHelper {
-	/**
-	 * returns whether the property is a collection
-	 */
-	protected function isCollection(string $propertyName): bool {
-		return in_array(
-			$propertyName,
-			[
-				IAccountManager::COLLECTION_EMAIL,
-			],
-			true
-		);
-	}
+    /**
+     * returns whether the property is a collection
+     */
+    protected function isCollection(string $propertyName): bool {
+        return in_array(
+            $propertyName,
+            [
+                IAccountManager::COLLECTION_EMAIL,
+            ],
+            true
+        );
+    }
 }

lib/private/App/AppStore/Fetcher/AppFetcher.php

Spacing +3 added lines, -3 removed lines

@@ -151,14 +151,14 @@ 
 			foreach ($releases as $release) {
 				$versions[] = $release['version'];
 			}
-			usort($versions, function ($version1, $version2) {
+			usort($versions, function($version1, $version2) {
 				return version_compare($version1, $version2);
 			});
 			$versions = array_reverse($versions);
 			if (isset($versions[0])) {
 				$highestVersion = $versions[0];
 				foreach ($releases as $release) {
-					if ((string)$release['version'] === (string)$highestVersion) {
+					if ((string) $release['version'] === (string) $highestVersion) {
 						$response['data'][$dataKey]['releases'] = [$release];
 						break;
 					}
@@ -188,7 +188,7 @@ 
 
 		// If the admin specified a allow list, filter apps from the appstore
 		if (is_array($allowList) && $this->registry->delegateHasValidSubscription()) {
-			return array_filter($apps, function ($app) use ($allowList) {
+			return array_filter($apps, function($app) use ($allowList) {
 				return in_array($app['id'], $allowList);
 			});
 		}

Indentation +153 added lines, -153 removed lines

@@ -16,157 +16,157 @@
 use Psr\Log\LoggerInterface;
 
 class AppFetcher extends Fetcher {
-	/** @var bool */
-	private $ignoreMaxVersion;
-
-	public function __construct(
-		Factory $appDataFactory,
-		IClientService $clientService,
-		ITimeFactory $timeFactory,
-		IConfig $config,
-		private CompareVersion $compareVersion,
-		LoggerInterface $logger,
-		protected IRegistry $registry,
-	) {
-		parent::__construct(
-			$appDataFactory,
-			$clientService,
-			$timeFactory,
-			$config,
-			$logger,
-			$registry
-		);
-
-		$this->fileName = 'apps.json';
-		$this->endpointName = 'apps.json';
-		$this->ignoreMaxVersion = true;
-	}
-
-	/**
-	 * Only returns the latest compatible app release in the releases array
-	 *
-	 * @param string $ETag
-	 * @param string $content
-	 * @param bool [$allowUnstable] Allow unstable releases
-	 *
-	 * @return array
-	 */
-	protected function fetch($ETag, $content, $allowUnstable = false) {
-		/** @var mixed[] $response */
-		$response = parent::fetch($ETag, $content);
-
-		if (!isset($response['data']) || $response['data'] === null) {
-			$this->logger->warning('Response from appstore is invalid, apps could not be retrieved. Try again later.', ['app' => 'appstoreFetcher']);
-			return [];
-		}
-
-		$allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
-		$allowNightly = $allowUnstable || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
-
-		foreach ($response['data'] as $dataKey => $app) {
-			$releases = [];
-
-			// Filter all compatible releases
-			foreach ($app['releases'] as $release) {
-				// Exclude all nightly and pre-releases if required
-				if (($allowNightly || $release['isNightly'] === false)
-					&& ($allowPreReleases || !str_contains($release['version'], '-'))) {
-					// Exclude all versions not compatible with the current version
-					try {
-						$versionParser = new VersionParser();
-						$serverVersion = $versionParser->getVersion($release['rawPlatformVersionSpec']);
-						$ncVersion = $this->getVersion();
-						$minServerVersion = $serverVersion->getMinimumVersion();
-						$maxServerVersion = $serverVersion->getMaximumVersion();
-						$minFulfilled = $this->compareVersion->isCompatible($ncVersion, $minServerVersion, '>=');
-						$maxFulfilled = $maxServerVersion !== ''
-							&& $this->compareVersion->isCompatible($ncVersion, $maxServerVersion, '<=');
-						$isPhpCompatible = true;
-						if (($release['rawPhpVersionSpec'] ?? '*') !== '*') {
-							$phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']);
-							$minPhpVersion = $phpVersion->getMinimumVersion();
-							$maxPhpVersion = $phpVersion->getMaximumVersion();
-							$minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible(
-								PHP_VERSION,
-								$minPhpVersion,
-								'>='
-							);
-							$maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible(
-								PHP_VERSION,
-								$maxPhpVersion,
-								'<='
-							);
-
-							$isPhpCompatible = $minPhpFulfilled && $maxPhpFulfilled;
-						}
-						if ($minFulfilled && ($this->ignoreMaxVersion || $maxFulfilled) && $isPhpCompatible) {
-							$releases[] = $release;
-						}
-					} catch (\InvalidArgumentException $e) {
-						$this->logger->warning($e->getMessage(), [
-							'exception' => $e,
-						]);
-					}
-				}
-			}
-
-			if (empty($releases)) {
-				// Remove apps that don't have a matching release
-				$response['data'][$dataKey] = [];
-				continue;
-			}
-
-			// Get the highest version
-			$versions = [];
-			foreach ($releases as $release) {
-				$versions[] = $release['version'];
-			}
-			usort($versions, function ($version1, $version2) {
-				return version_compare($version1, $version2);
-			});
-			$versions = array_reverse($versions);
-			if (isset($versions[0])) {
-				$highestVersion = $versions[0];
-				foreach ($releases as $release) {
-					if ((string)$release['version'] === (string)$highestVersion) {
-						$response['data'][$dataKey]['releases'] = [$release];
-						break;
-					}
-				}
-			}
-		}
-
-		$response['data'] = array_values(array_filter($response['data']));
-		return $response;
-	}
-
-	/**
-	 * @param string $version
-	 * @param string $fileName
-	 * @param bool $ignoreMaxVersion
-	 */
-	public function setVersion(string $version, string $fileName = 'apps.json', bool $ignoreMaxVersion = true) {
-		parent::setVersion($version);
-		$this->fileName = $fileName;
-		$this->ignoreMaxVersion = $ignoreMaxVersion;
-	}
-
-	public function get($allowUnstable = false): array {
-		$allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
-
-		$apps = parent::get($allowPreReleases);
-		if (empty($apps)) {
-			return [];
-		}
-		$allowList = $this->config->getSystemValue('appsallowlist');
-
-		// If the admin specified a allow list, filter apps from the appstore
-		if (is_array($allowList) && $this->registry->delegateHasValidSubscription()) {
-			return array_filter($apps, function ($app) use ($allowList) {
-				return in_array($app['id'], $allowList);
-			});
-		}
-
-		return $apps;
-	}
+    /** @var bool */
+    private $ignoreMaxVersion;
+
+    public function __construct(
+        Factory $appDataFactory,
+        IClientService $clientService,
+        ITimeFactory $timeFactory,
+        IConfig $config,
+        private CompareVersion $compareVersion,
+        LoggerInterface $logger,
+        protected IRegistry $registry,
+    ) {
+        parent::__construct(
+            $appDataFactory,
+            $clientService,
+            $timeFactory,
+            $config,
+            $logger,
+            $registry
+        );
+
+        $this->fileName = 'apps.json';
+        $this->endpointName = 'apps.json';
+        $this->ignoreMaxVersion = true;
+    }
+
+    /**
+     * Only returns the latest compatible app release in the releases array
+     *
+     * @param string $ETag
+     * @param string $content
+     * @param bool [$allowUnstable] Allow unstable releases
+     *
+     * @return array
+     */
+    protected function fetch($ETag, $content, $allowUnstable = false) {
+        /** @var mixed[] $response */
+        $response = parent::fetch($ETag, $content);
+
+        if (!isset($response['data']) || $response['data'] === null) {
+            $this->logger->warning('Response from appstore is invalid, apps could not be retrieved. Try again later.', ['app' => 'appstoreFetcher']);
+            return [];
+        }
+
+        $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
+        $allowNightly = $allowUnstable || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
+
+        foreach ($response['data'] as $dataKey => $app) {
+            $releases = [];
+
+            // Filter all compatible releases
+            foreach ($app['releases'] as $release) {
+                // Exclude all nightly and pre-releases if required
+                if (($allowNightly || $release['isNightly'] === false)
+                    && ($allowPreReleases || !str_contains($release['version'], '-'))) {
+                    // Exclude all versions not compatible with the current version
+                    try {
+                        $versionParser = new VersionParser();
+                        $serverVersion = $versionParser->getVersion($release['rawPlatformVersionSpec']);
+                        $ncVersion = $this->getVersion();
+                        $minServerVersion = $serverVersion->getMinimumVersion();
+                        $maxServerVersion = $serverVersion->getMaximumVersion();
+                        $minFulfilled = $this->compareVersion->isCompatible($ncVersion, $minServerVersion, '>=');
+                        $maxFulfilled = $maxServerVersion !== ''
+                            && $this->compareVersion->isCompatible($ncVersion, $maxServerVersion, '<=');
+                        $isPhpCompatible = true;
+                        if (($release['rawPhpVersionSpec'] ?? '*') !== '*') {
+                            $phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']);
+                            $minPhpVersion = $phpVersion->getMinimumVersion();
+                            $maxPhpVersion = $phpVersion->getMaximumVersion();
+                            $minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible(
+                                PHP_VERSION,
+                                $minPhpVersion,
+                                '>='
+                            );
+                            $maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible(
+                                PHP_VERSION,
+                                $maxPhpVersion,
+                                '<='
+                            );
+
+                            $isPhpCompatible = $minPhpFulfilled && $maxPhpFulfilled;
+                        }
+                        if ($minFulfilled && ($this->ignoreMaxVersion || $maxFulfilled) && $isPhpCompatible) {
+                            $releases[] = $release;
+                        }
+                    } catch (\InvalidArgumentException $e) {
+                        $this->logger->warning($e->getMessage(), [
+                            'exception' => $e,
+                        ]);
+                    }
+                }
+            }
+
+            if (empty($releases)) {
+                // Remove apps that don't have a matching release
+                $response['data'][$dataKey] = [];
+                continue;
+            }
+
+            // Get the highest version
+            $versions = [];
+            foreach ($releases as $release) {
+                $versions[] = $release['version'];
+            }
+            usort($versions, function ($version1, $version2) {
+                return version_compare($version1, $version2);
+            });
+            $versions = array_reverse($versions);
+            if (isset($versions[0])) {
+                $highestVersion = $versions[0];
+                foreach ($releases as $release) {
+                    if ((string)$release['version'] === (string)$highestVersion) {
+                        $response['data'][$dataKey]['releases'] = [$release];
+                        break;
+                    }
+                }
+            }
+        }
+
+        $response['data'] = array_values(array_filter($response['data']));
+        return $response;
+    }
+
+    /**
+     * @param string $version
+     * @param string $fileName
+     * @param bool $ignoreMaxVersion
+     */
+    public function setVersion(string $version, string $fileName = 'apps.json', bool $ignoreMaxVersion = true) {
+        parent::setVersion($version);
+        $this->fileName = $fileName;
+        $this->ignoreMaxVersion = $ignoreMaxVersion;
+    }
+
+    public function get($allowUnstable = false): array {
+        $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
+
+        $apps = parent::get($allowPreReleases);
+        if (empty($apps)) {
+            return [];
+        }
+        $allowList = $this->config->getSystemValue('appsallowlist');
+
+        // If the admin specified a allow list, filter apps from the appstore
+        if (is_array($allowList) && $this->registry->delegateHasValidSubscription()) {
+            return array_filter($apps, function ($app) use ($allowList) {
+                return in_array($app['id'], $allowList);
+            });
+        }
+
+        return $apps;
+    }
 }

lib/private/App/InfoParser.php

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
 		}
 
 		if ($this->cache !== null) {
-			$fileCacheKey = $file . filemtime($file);
+			$fileCacheKey = $file.filemtime($file);
 			if ($cachedValue = $this->cache->get($fileCacheKey)) {
 				return json_decode($cachedValue, true);
 			}
@@ -234,7 +234,7 @@ 
 	 */
 	public function xmlToArray($xml) {
 		if (!$xml->children()) {
-			return (string)$xml;
+			return (string) $xml;
 		}
 
 		$array = [];
@@ -251,7 +251,7 @@ 
 					'@attributes' => [],
 				];
 				if (!count($node->children())) {
-					$value = (string)$node;
+					$value = (string) $node;
 					if (!empty($value)) {
 						$data['@value'] = $value;
 					}
@@ -259,7 +259,7 @@ 
 					$data = array_merge($data, $this->xmlToArray($node));
 				}
 				foreach ($attributes as $attr => $value) {
-					$data['@attributes'][$attr] = (string)$value;
+					$data['@attributes'][$attr] = (string) $value;
 				}
 
 				if ($totalElement > 1) {

Indentation +246 added lines, -246 removed lines

@@ -10,265 +10,265 @@
 use function simplexml_load_string;
 
 class InfoParser {
-	/**
-	 * @param ICache|null $cache
-	 */
-	public function __construct(
-		private ?ICache $cache = null,
-	) {
-	}
+    /**
+     * @param ICache|null $cache
+     */
+    public function __construct(
+        private ?ICache $cache = null,
+    ) {
+    }
 
-	/**
-	 * @param string $file the xml file to be loaded
-	 * @return null|array where null is an indicator for an error
-	 */
-	public function parse($file) {
-		if (!file_exists($file)) {
-			return null;
-		}
+    /**
+     * @param string $file the xml file to be loaded
+     * @return null|array where null is an indicator for an error
+     */
+    public function parse($file) {
+        if (!file_exists($file)) {
+            return null;
+        }
 
-		if ($this->cache !== null) {
-			$fileCacheKey = $file . filemtime($file);
-			if ($cachedValue = $this->cache->get($fileCacheKey)) {
-				return json_decode($cachedValue, true);
-			}
-		}
+        if ($this->cache !== null) {
+            $fileCacheKey = $file . filemtime($file);
+            if ($cachedValue = $this->cache->get($fileCacheKey)) {
+                return json_decode($cachedValue, true);
+            }
+        }
 
-		libxml_use_internal_errors(true);
-		$xml = simplexml_load_string(file_get_contents($file));
+        libxml_use_internal_errors(true);
+        $xml = simplexml_load_string(file_get_contents($file));
 
-		if ($xml === false) {
-			libxml_clear_errors();
-			return null;
-		}
-		$array = $this->xmlToArray($xml);
+        if ($xml === false) {
+            libxml_clear_errors();
+            return null;
+        }
+        $array = $this->xmlToArray($xml);
 
-		if (is_null($array)) {
-			return null;
-		}
+        if (is_null($array)) {
+            return null;
+        }
 
-		if (!array_key_exists('info', $array)) {
-			$array['info'] = [];
-		}
-		if (!array_key_exists('remote', $array)) {
-			$array['remote'] = [];
-		}
-		if (!array_key_exists('public', $array)) {
-			$array['public'] = [];
-		}
-		if (!array_key_exists('types', $array)) {
-			$array['types'] = [];
-		}
-		if (!array_key_exists('repair-steps', $array)) {
-			$array['repair-steps'] = [];
-		}
-		if (!array_key_exists('install', $array['repair-steps'])) {
-			$array['repair-steps']['install'] = [];
-		}
-		if (!array_key_exists('pre-migration', $array['repair-steps'])) {
-			$array['repair-steps']['pre-migration'] = [];
-		}
-		if (!array_key_exists('post-migration', $array['repair-steps'])) {
-			$array['repair-steps']['post-migration'] = [];
-		}
-		if (!array_key_exists('live-migration', $array['repair-steps'])) {
-			$array['repair-steps']['live-migration'] = [];
-		}
-		if (!array_key_exists('uninstall', $array['repair-steps'])) {
-			$array['repair-steps']['uninstall'] = [];
-		}
-		if (!array_key_exists('background-jobs', $array)) {
-			$array['background-jobs'] = [];
-		}
-		if (!array_key_exists('two-factor-providers', $array)) {
-			$array['two-factor-providers'] = [];
-		}
-		if (!array_key_exists('commands', $array)) {
-			$array['commands'] = [];
-		}
-		if (!array_key_exists('activity', $array)) {
-			$array['activity'] = [];
-		}
-		if (!array_key_exists('filters', $array['activity'])) {
-			$array['activity']['filters'] = [];
-		}
-		if (!array_key_exists('settings', $array['activity'])) {
-			$array['activity']['settings'] = [];
-		}
-		if (!array_key_exists('providers', $array['activity'])) {
-			$array['activity']['providers'] = [];
-		}
-		if (!array_key_exists('settings', $array)) {
-			$array['settings'] = [];
-		}
-		if (!array_key_exists('admin', $array['settings'])) {
-			$array['settings']['admin'] = [];
-		}
-		if (!array_key_exists('admin-section', $array['settings'])) {
-			$array['settings']['admin-section'] = [];
-		}
-		if (!array_key_exists('personal', $array['settings'])) {
-			$array['settings']['personal'] = [];
-		}
-		if (!array_key_exists('personal-section', $array['settings'])) {
-			$array['settings']['personal-section'] = [];
-		}
-		if (!array_key_exists('dependencies', $array)) {
-			$array['dependencies'] = [];
-		}
-		if (!array_key_exists('backend', $array['dependencies'])) {
-			$array['dependencies']['backend'] = [];
-		}
+        if (!array_key_exists('info', $array)) {
+            $array['info'] = [];
+        }
+        if (!array_key_exists('remote', $array)) {
+            $array['remote'] = [];
+        }
+        if (!array_key_exists('public', $array)) {
+            $array['public'] = [];
+        }
+        if (!array_key_exists('types', $array)) {
+            $array['types'] = [];
+        }
+        if (!array_key_exists('repair-steps', $array)) {
+            $array['repair-steps'] = [];
+        }
+        if (!array_key_exists('install', $array['repair-steps'])) {
+            $array['repair-steps']['install'] = [];
+        }
+        if (!array_key_exists('pre-migration', $array['repair-steps'])) {
+            $array['repair-steps']['pre-migration'] = [];
+        }
+        if (!array_key_exists('post-migration', $array['repair-steps'])) {
+            $array['repair-steps']['post-migration'] = [];
+        }
+        if (!array_key_exists('live-migration', $array['repair-steps'])) {
+            $array['repair-steps']['live-migration'] = [];
+        }
+        if (!array_key_exists('uninstall', $array['repair-steps'])) {
+            $array['repair-steps']['uninstall'] = [];
+        }
+        if (!array_key_exists('background-jobs', $array)) {
+            $array['background-jobs'] = [];
+        }
+        if (!array_key_exists('two-factor-providers', $array)) {
+            $array['two-factor-providers'] = [];
+        }
+        if (!array_key_exists('commands', $array)) {
+            $array['commands'] = [];
+        }
+        if (!array_key_exists('activity', $array)) {
+            $array['activity'] = [];
+        }
+        if (!array_key_exists('filters', $array['activity'])) {
+            $array['activity']['filters'] = [];
+        }
+        if (!array_key_exists('settings', $array['activity'])) {
+            $array['activity']['settings'] = [];
+        }
+        if (!array_key_exists('providers', $array['activity'])) {
+            $array['activity']['providers'] = [];
+        }
+        if (!array_key_exists('settings', $array)) {
+            $array['settings'] = [];
+        }
+        if (!array_key_exists('admin', $array['settings'])) {
+            $array['settings']['admin'] = [];
+        }
+        if (!array_key_exists('admin-section', $array['settings'])) {
+            $array['settings']['admin-section'] = [];
+        }
+        if (!array_key_exists('personal', $array['settings'])) {
+            $array['settings']['personal'] = [];
+        }
+        if (!array_key_exists('personal-section', $array['settings'])) {
+            $array['settings']['personal-section'] = [];
+        }
+        if (!array_key_exists('dependencies', $array)) {
+            $array['dependencies'] = [];
+        }
+        if (!array_key_exists('backend', $array['dependencies'])) {
+            $array['dependencies']['backend'] = [];
+        }
 
-		if (array_key_exists('types', $array)) {
-			if (is_array($array['types'])) {
-				foreach ($array['types'] as $type => $v) {
-					unset($array['types'][$type]);
-					if (is_string($type)) {
-						$array['types'][] = $type;
-					}
-				}
-			} else {
-				$array['types'] = [];
-			}
-		}
-		if (isset($array['repair-steps']['install']['step']) && is_array($array['repair-steps']['install']['step'])) {
-			$array['repair-steps']['install'] = $array['repair-steps']['install']['step'];
-		}
-		if (isset($array['repair-steps']['pre-migration']['step']) && is_array($array['repair-steps']['pre-migration']['step'])) {
-			$array['repair-steps']['pre-migration'] = $array['repair-steps']['pre-migration']['step'];
-		}
-		if (isset($array['repair-steps']['post-migration']['step']) && is_array($array['repair-steps']['post-migration']['step'])) {
-			$array['repair-steps']['post-migration'] = $array['repair-steps']['post-migration']['step'];
-		}
-		if (isset($array['repair-steps']['live-migration']['step']) && is_array($array['repair-steps']['live-migration']['step'])) {
-			$array['repair-steps']['live-migration'] = $array['repair-steps']['live-migration']['step'];
-		}
-		if (isset($array['repair-steps']['uninstall']['step']) && is_array($array['repair-steps']['uninstall']['step'])) {
-			$array['repair-steps']['uninstall'] = $array['repair-steps']['uninstall']['step'];
-		}
-		if (isset($array['background-jobs']['job']) && is_array($array['background-jobs']['job'])) {
-			$array['background-jobs'] = $array['background-jobs']['job'];
-		}
-		if (isset($array['commands']['command']) && is_array($array['commands']['command'])) {
-			$array['commands'] = $array['commands']['command'];
-		}
-		if (isset($array['two-factor-providers']['provider']) && is_array($array['two-factor-providers']['provider'])) {
-			$array['two-factor-providers'] = $array['two-factor-providers']['provider'];
-		}
-		if (isset($array['activity']['filters']['filter']) && is_array($array['activity']['filters']['filter'])) {
-			$array['activity']['filters'] = $array['activity']['filters']['filter'];
-		}
-		if (isset($array['activity']['settings']['setting']) && is_array($array['activity']['settings']['setting'])) {
-			$array['activity']['settings'] = $array['activity']['settings']['setting'];
-		}
-		if (isset($array['activity']['providers']['provider']) && is_array($array['activity']['providers']['provider'])) {
-			$array['activity']['providers'] = $array['activity']['providers']['provider'];
-		}
-		if (isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
-			&& is_array($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
-			&& !isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']['class'])
-		) {
-			$array['collaboration']['collaborators']['searchPlugins'] = $array['collaboration']['collaborators']['searchPlugins']['searchPlugin'];
-		}
-		if (isset($array['settings']['admin']) && !is_array($array['settings']['admin'])) {
-			$array['settings']['admin'] = [$array['settings']['admin']];
-		}
-		if (isset($array['settings']['admin-section']) && !is_array($array['settings']['admin-section'])) {
-			$array['settings']['admin-section'] = [$array['settings']['admin-section']];
-		}
-		if (isset($array['settings']['personal']) && !is_array($array['settings']['personal'])) {
-			$array['settings']['personal'] = [$array['settings']['personal']];
-		}
-		if (isset($array['settings']['personal-section']) && !is_array($array['settings']['personal-section'])) {
-			$array['settings']['personal-section'] = [$array['settings']['personal-section']];
-		}
-		if (isset($array['navigations']['navigation']) && $this->isNavigationItem($array['navigations']['navigation'])) {
-			$array['navigations']['navigation'] = [$array['navigations']['navigation']];
-		}
-		if (isset($array['dependencies']['backend']) && !is_array($array['dependencies']['backend'])) {
-			$array['dependencies']['backend'] = [$array['dependencies']['backend']];
-		}
+        if (array_key_exists('types', $array)) {
+            if (is_array($array['types'])) {
+                foreach ($array['types'] as $type => $v) {
+                    unset($array['types'][$type]);
+                    if (is_string($type)) {
+                        $array['types'][] = $type;
+                    }
+                }
+            } else {
+                $array['types'] = [];
+            }
+        }
+        if (isset($array['repair-steps']['install']['step']) && is_array($array['repair-steps']['install']['step'])) {
+            $array['repair-steps']['install'] = $array['repair-steps']['install']['step'];
+        }
+        if (isset($array['repair-steps']['pre-migration']['step']) && is_array($array['repair-steps']['pre-migration']['step'])) {
+            $array['repair-steps']['pre-migration'] = $array['repair-steps']['pre-migration']['step'];
+        }
+        if (isset($array['repair-steps']['post-migration']['step']) && is_array($array['repair-steps']['post-migration']['step'])) {
+            $array['repair-steps']['post-migration'] = $array['repair-steps']['post-migration']['step'];
+        }
+        if (isset($array['repair-steps']['live-migration']['step']) && is_array($array['repair-steps']['live-migration']['step'])) {
+            $array['repair-steps']['live-migration'] = $array['repair-steps']['live-migration']['step'];
+        }
+        if (isset($array['repair-steps']['uninstall']['step']) && is_array($array['repair-steps']['uninstall']['step'])) {
+            $array['repair-steps']['uninstall'] = $array['repair-steps']['uninstall']['step'];
+        }
+        if (isset($array['background-jobs']['job']) && is_array($array['background-jobs']['job'])) {
+            $array['background-jobs'] = $array['background-jobs']['job'];
+        }
+        if (isset($array['commands']['command']) && is_array($array['commands']['command'])) {
+            $array['commands'] = $array['commands']['command'];
+        }
+        if (isset($array['two-factor-providers']['provider']) && is_array($array['two-factor-providers']['provider'])) {
+            $array['two-factor-providers'] = $array['two-factor-providers']['provider'];
+        }
+        if (isset($array['activity']['filters']['filter']) && is_array($array['activity']['filters']['filter'])) {
+            $array['activity']['filters'] = $array['activity']['filters']['filter'];
+        }
+        if (isset($array['activity']['settings']['setting']) && is_array($array['activity']['settings']['setting'])) {
+            $array['activity']['settings'] = $array['activity']['settings']['setting'];
+        }
+        if (isset($array['activity']['providers']['provider']) && is_array($array['activity']['providers']['provider'])) {
+            $array['activity']['providers'] = $array['activity']['providers']['provider'];
+        }
+        if (isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
+            && is_array($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
+            && !isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']['class'])
+        ) {
+            $array['collaboration']['collaborators']['searchPlugins'] = $array['collaboration']['collaborators']['searchPlugins']['searchPlugin'];
+        }
+        if (isset($array['settings']['admin']) && !is_array($array['settings']['admin'])) {
+            $array['settings']['admin'] = [$array['settings']['admin']];
+        }
+        if (isset($array['settings']['admin-section']) && !is_array($array['settings']['admin-section'])) {
+            $array['settings']['admin-section'] = [$array['settings']['admin-section']];
+        }
+        if (isset($array['settings']['personal']) && !is_array($array['settings']['personal'])) {
+            $array['settings']['personal'] = [$array['settings']['personal']];
+        }
+        if (isset($array['settings']['personal-section']) && !is_array($array['settings']['personal-section'])) {
+            $array['settings']['personal-section'] = [$array['settings']['personal-section']];
+        }
+        if (isset($array['navigations']['navigation']) && $this->isNavigationItem($array['navigations']['navigation'])) {
+            $array['navigations']['navigation'] = [$array['navigations']['navigation']];
+        }
+        if (isset($array['dependencies']['backend']) && !is_array($array['dependencies']['backend'])) {
+            $array['dependencies']['backend'] = [$array['dependencies']['backend']];
+        }
 
-		// Ensure some fields are always arrays
-		if (isset($array['screenshot']) && !is_array($array['screenshot'])) {
-			$array['screenshot'] = [$array['screenshot']];
-		}
-		if (isset($array['author']) && !is_array($array['author'])) {
-			$array['author'] = [$array['author']];
-		}
-		if (isset($array['category']) && !is_array($array['category'])) {
-			$array['category'] = [$array['category']];
-		}
+        // Ensure some fields are always arrays
+        if (isset($array['screenshot']) && !is_array($array['screenshot'])) {
+            $array['screenshot'] = [$array['screenshot']];
+        }
+        if (isset($array['author']) && !is_array($array['author'])) {
+            $array['author'] = [$array['author']];
+        }
+        if (isset($array['category']) && !is_array($array['category'])) {
+            $array['category'] = [$array['category']];
+        }
 
-		if ($this->cache !== null) {
-			$this->cache->set($fileCacheKey, json_encode($array));
-		}
-		return $array;
-	}
+        if ($this->cache !== null) {
+            $this->cache->set($fileCacheKey, json_encode($array));
+        }
+        return $array;
+    }
 
-	/**
-	 * @param $data
-	 * @return bool
-	 */
-	private function isNavigationItem($data): bool {
-		// Allow settings navigation items with no route entry
-		$type = $data['type'] ?? 'link';
-		if ($type === 'settings') {
-			return isset($data['name']);
-		}
-		return isset($data['name'], $data['route']);
-	}
+    /**
+     * @param $data
+     * @return bool
+     */
+    private function isNavigationItem($data): bool {
+        // Allow settings navigation items with no route entry
+        $type = $data['type'] ?? 'link';
+        if ($type === 'settings') {
+            return isset($data['name']);
+        }
+        return isset($data['name'], $data['route']);
+    }
 
-	/**
-	 * @param \SimpleXMLElement $xml
-	 * @return array
-	 */
-	public function xmlToArray($xml) {
-		if (!$xml->children()) {
-			return (string)$xml;
-		}
+    /**
+     * @param \SimpleXMLElement $xml
+     * @return array
+     */
+    public function xmlToArray($xml) {
+        if (!$xml->children()) {
+            return (string)$xml;
+        }
 
-		$array = [];
-		foreach ($xml->children() as $element => $node) {
-			$totalElement = count($xml->{$element});
+        $array = [];
+        foreach ($xml->children() as $element => $node) {
+            $totalElement = count($xml->{$element});
 
-			if (!isset($array[$element])) {
-				$array[$element] = $totalElement > 1 ? [] : '';
-			}
-			/** @var \SimpleXMLElement $node */
-			// Has attributes
-			if ($attributes = $node->attributes()) {
-				$data = [
-					'@attributes' => [],
-				];
-				if (!count($node->children())) {
-					$value = (string)$node;
-					if (!empty($value)) {
-						$data['@value'] = $value;
-					}
-				} else {
-					$data = array_merge($data, $this->xmlToArray($node));
-				}
-				foreach ($attributes as $attr => $value) {
-					$data['@attributes'][$attr] = (string)$value;
-				}
+            if (!isset($array[$element])) {
+                $array[$element] = $totalElement > 1 ? [] : '';
+            }
+            /** @var \SimpleXMLElement $node */
+            // Has attributes
+            if ($attributes = $node->attributes()) {
+                $data = [
+                    '@attributes' => [],
+                ];
+                if (!count($node->children())) {
+                    $value = (string)$node;
+                    if (!empty($value)) {
+                        $data['@value'] = $value;
+                    }
+                } else {
+                    $data = array_merge($data, $this->xmlToArray($node));
+                }
+                foreach ($attributes as $attr => $value) {
+                    $data['@attributes'][$attr] = (string)$value;
+                }
 
-				if ($totalElement > 1) {
-					$array[$element][] = $data;
-				} else {
-					$array[$element] = $data;
-				}
-				// Just a value
-			} else {
-				if ($totalElement > 1) {
-					$array[$element][] = $this->xmlToArray($node);
-				} else {
-					$array[$element] = $this->xmlToArray($node);
-				}
-			}
-		}
+                if ($totalElement > 1) {
+                    $array[$element][] = $data;
+                } else {
+                    $array[$element] = $data;
+                }
+                // Just a value
+            } else {
+                if ($totalElement > 1) {
+                    $array[$element][] = $this->xmlToArray($node);
+                } else {
+                    $array[$element] = $this->xmlToArray($node);
+                }
+            }
+        }
 
-		return $array;
-	}
+        return $array;
+    }
 }

lib/private/Profile/Actions/PhoneAction.php

Spacing +1 added lines, -1 removed lines

@@ -89,6 +89,6 @@
 		if (empty($this->value)) {
 			return null;
 		}
-		return 'tel:' . $this->value;
+		return 'tel:'.$this->value;
 	}
 }

Indentation +44 added lines, -44 removed lines

@@ -16,48 +16,48 @@
 use OCP\Profile\ILinkAction;
 
 class PhoneAction implements ILinkAction {
-	private string $value = '';
-
-	public function __construct(
-		private IAccountManager $accountManager,
-		private IFactory $l10nFactory,
-		private IURLGenerator $urlGenerator,
-	) {
-	}
-
-	public function preload(IUser $targetUser): void {
-		$account = $this->accountManager->getAccount($targetUser);
-		$this->value = $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue();
-	}
-
-	public function getAppId(): string {
-		return 'core';
-	}
-
-	public function getId(): string {
-		return IAccountManager::PROPERTY_PHONE;
-	}
-
-	public function getDisplayId(): string {
-		return $this->l10nFactory->get('lib')->t('Phone');
-	}
-
-	public function getTitle(): string {
-		return $this->l10nFactory->get('lib')->t('Call %s', [$this->value]);
-	}
-
-	public function getPriority(): int {
-		return 30;
-	}
-
-	public function getIcon(): string {
-		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/phone.svg'));
-	}
-
-	public function getTarget(): ?string {
-		if (empty($this->value)) {
-			return null;
-		}
-		return 'tel:' . $this->value;
-	}
+    private string $value = '';
+
+    public function __construct(
+        private IAccountManager $accountManager,
+        private IFactory $l10nFactory,
+        private IURLGenerator $urlGenerator,
+    ) {
+    }
+
+    public function preload(IUser $targetUser): void {
+        $account = $this->accountManager->getAccount($targetUser);
+        $this->value = $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue();
+    }
+
+    public function getAppId(): string {
+        return 'core';
+    }
+
+    public function getId(): string {
+        return IAccountManager::PROPERTY_PHONE;
+    }
+
+    public function getDisplayId(): string {
+        return $this->l10nFactory->get('lib')->t('Phone');
+    }
+
+    public function getTitle(): string {
+        return $this->l10nFactory->get('lib')->t('Call %s', [$this->value]);
+    }
+
+    public function getPriority(): int {
+        return 30;
+    }
+
+    public function getIcon(): string {
+        return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/phone.svg'));
+    }
+
+    public function getTarget(): ?string {
+        if (empty($this->value)) {
+            return null;
+        }
+        return 'tel:' . $this->value;
+    }
 }

lib/private/Profile/Actions/EmailAction.php

Spacing +1 added lines, -1 removed lines

@@ -89,6 +89,6 @@
 		if (empty($this->value)) {
 			return null;
 		}
-		return 'mailto:' . $this->value;
+		return 'mailto:'.$this->value;
 	}
 }

Indentation +44 added lines, -44 removed lines

@@ -16,48 +16,48 @@
 use OCP\Profile\ILinkAction;
 
 class EmailAction implements ILinkAction {
-	private string $value = '';
-
-	public function __construct(
-		private IAccountManager $accountManager,
-		private IFactory $l10nFactory,
-		private IURLGenerator $urlGenerator,
-	) {
-	}
-
-	public function preload(IUser $targetUser): void {
-		$account = $this->accountManager->getAccount($targetUser);
-		$this->value = $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue();
-	}
-
-	public function getAppId(): string {
-		return 'core';
-	}
-
-	public function getId(): string {
-		return IAccountManager::PROPERTY_EMAIL;
-	}
-
-	public function getDisplayId(): string {
-		return $this->l10nFactory->get('lib')->t('Email');
-	}
-
-	public function getTitle(): string {
-		return $this->l10nFactory->get('lib')->t('Mail %s', [$this->value]);
-	}
-
-	public function getPriority(): int {
-		return 20;
-	}
-
-	public function getIcon(): string {
-		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/mail.svg'));
-	}
-
-	public function getTarget(): ?string {
-		if (empty($this->value)) {
-			return null;
-		}
-		return 'mailto:' . $this->value;
-	}
+    private string $value = '';
+
+    public function __construct(
+        private IAccountManager $accountManager,
+        private IFactory $l10nFactory,
+        private IURLGenerator $urlGenerator,
+    ) {
+    }
+
+    public function preload(IUser $targetUser): void {
+        $account = $this->accountManager->getAccount($targetUser);
+        $this->value = $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue();
+    }
+
+    public function getAppId(): string {
+        return 'core';
+    }
+
+    public function getId(): string {
+        return IAccountManager::PROPERTY_EMAIL;
+    }
+
+    public function getDisplayId(): string {
+        return $this->l10nFactory->get('lib')->t('Email');
+    }
+
+    public function getTitle(): string {
+        return $this->l10nFactory->get('lib')->t('Mail %s', [$this->value]);
+    }
+
+    public function getPriority(): int {
+        return 20;
+    }
+
+    public function getIcon(): string {
+        return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/mail.svg'));
+    }
+
+    public function getTarget(): ?string {
+        if (empty($this->value)) {
+            return null;
+        }
+        return 'mailto:' . $this->value;
+    }
 }

lib/private/Profile/Actions/TwitterAction.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 	}
 
 	public function getTitle(): string {
-		$displayUsername = $this->value[0] === '@' ? $this->value : '@' . $this->value;
+		$displayUsername = $this->value[0] === '@' ? $this->value : '@'.$this->value;
 		return $this->l10nFactory->get('lib')->t('View %s on Twitter', [$displayUsername]);
 	}
 
@@ -92,6 +92,6 @@ 
 			return null;
 		}
 		$username = $this->value[0] === '@' ? substr($this->value, 1) : $this->value;
-		return 'https://twitter.com/' . $username;
+		return 'https://twitter.com/'.$username;
 	}
 }

Indentation +37 added lines, -37 removed lines

@@ -17,50 +17,50 @@
 use function substr;
 
 class TwitterAction implements ILinkAction {
-	private string $value = '';
+    private string $value = '';
 
-	public function __construct(
-		private IAccountManager $accountManager,
-		private IFactory $l10nFactory,
-		private IURLGenerator $urlGenerator,
-	) {
-	}
+    public function __construct(
+        private IAccountManager $accountManager,
+        private IFactory $l10nFactory,
+        private IURLGenerator $urlGenerator,
+    ) {
+    }
 
-	public function preload(IUser $targetUser): void {
-		$account = $this->accountManager->getAccount($targetUser);
-		$this->value = $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getValue();
-	}
+    public function preload(IUser $targetUser): void {
+        $account = $this->accountManager->getAccount($targetUser);
+        $this->value = $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getValue();
+    }
 
-	public function getAppId(): string {
-		return 'core';
-	}
+    public function getAppId(): string {
+        return 'core';
+    }
 
-	public function getId(): string {
-		return IAccountManager::PROPERTY_TWITTER;
-	}
+    public function getId(): string {
+        return IAccountManager::PROPERTY_TWITTER;
+    }
 
-	public function getDisplayId(): string {
-		return $this->l10nFactory->get('lib')->t('Twitter');
-	}
+    public function getDisplayId(): string {
+        return $this->l10nFactory->get('lib')->t('Twitter');
+    }
 
-	public function getTitle(): string {
-		$displayUsername = $this->value[0] === '@' ? $this->value : '@' . $this->value;
-		return $this->l10nFactory->get('lib')->t('View %s on Twitter', [$displayUsername]);
-	}
+    public function getTitle(): string {
+        $displayUsername = $this->value[0] === '@' ? $this->value : '@' . $this->value;
+        return $this->l10nFactory->get('lib')->t('View %s on Twitter', [$displayUsername]);
+    }
 
-	public function getPriority(): int {
-		return 50;
-	}
+    public function getPriority(): int {
+        return 50;
+    }
 
-	public function getIcon(): string {
-		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/twitter.svg'));
-	}
+    public function getIcon(): string {
+        return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/twitter.svg'));
+    }
 
-	public function getTarget(): ?string {
-		if (empty($this->value)) {
-			return null;
-		}
-		$username = $this->value[0] === '@' ? substr($this->value, 1) : $this->value;
-		return 'https://twitter.com/' . $username;
-	}
+    public function getTarget(): ?string {
+        if (empty($this->value)) {
+            return null;
+        }
+        $username = $this->value[0] === '@' ? substr($this->value, 1) : $this->value;
+        return 'https://twitter.com/' . $username;
+    }
 }

lib/private/UserStatus/Manager.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 		try {
 			$provider = $this->container->get($this->providerClass);
 		} catch (ContainerExceptionInterface $e) {
-			$this->logger->error('Could not load user-status "' . $this->providerClass . '" provider dynamically: ' . $e->getMessage(), [
+			$this->logger->error('Could not load user-status "'.$this->providerClass.'" provider dynamically: '.$e->getMessage(), [
 				'exception' => $e,
 			]);
 			return;

Indentation +96 added lines, -96 removed lines

@@ -15,100 +15,100 @@
 use Psr\Log\LoggerInterface;
 
 class Manager implements IManager {
-	/** @var IServerContainer */
-	private $container;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	/** @var class-string */
-	private $providerClass;
-
-	/** @var IProvider */
-	private $provider;
-
-	/**
-	 * Manager constructor.
-	 *
-	 * @param IServerContainer $container
-	 * @param LoggerInterface $logger
-	 */
-	public function __construct(IServerContainer $container,
-		LoggerInterface $logger) {
-		$this->container = $container;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getUserStatuses(array $userIds): array {
-		$this->setupProvider();
-		if (!$this->provider) {
-			return [];
-		}
-
-		return $this->provider->getUserStatuses($userIds);
-	}
-
-	/**
-	 * @param string $class
-	 * @since 20.0.0
-	 * @internal
-	 */
-	public function registerProvider(string $class): void {
-		$this->providerClass = $class;
-		$this->provider = null;
-	}
-
-	/**
-	 * Lazily set up provider
-	 */
-	private function setupProvider(): void {
-		if ($this->provider !== null) {
-			return;
-		}
-		if ($this->providerClass === null) {
-			return;
-		}
-
-		/**
-		 * @psalm-suppress InvalidCatch
-		 */
-		try {
-			$provider = $this->container->get($this->providerClass);
-		} catch (ContainerExceptionInterface $e) {
-			$this->logger->error('Could not load user-status "' . $this->providerClass . '" provider dynamically: ' . $e->getMessage(), [
-				'exception' => $e,
-			]);
-			return;
-		}
-
-		$this->provider = $provider;
-	}
-
-	public function setUserStatus(string $userId, string $messageId, string $status, bool $createBackup = false, ?string $customMessage = null): void {
-		$this->setupProvider();
-		if (!$this->provider || !($this->provider instanceof ISettableProvider)) {
-			return;
-		}
-
-		$this->provider->setUserStatus($userId, $messageId, $status, $createBackup, $customMessage);
-	}
-
-	public function revertUserStatus(string $userId, string $messageId, string $status): void {
-		$this->setupProvider();
-		if (!$this->provider || !($this->provider instanceof ISettableProvider)) {
-			return;
-		}
-		$this->provider->revertUserStatus($userId, $messageId, $status);
-	}
-
-	public function revertMultipleUserStatus(array $userIds, string $messageId, string $status): void {
-		$this->setupProvider();
-		if (!$this->provider || !($this->provider instanceof ISettableProvider)) {
-			return;
-		}
-		$this->provider->revertMultipleUserStatus($userIds, $messageId, $status);
-	}
+    /** @var IServerContainer */
+    private $container;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    /** @var class-string */
+    private $providerClass;
+
+    /** @var IProvider */
+    private $provider;
+
+    /**
+     * Manager constructor.
+     *
+     * @param IServerContainer $container
+     * @param LoggerInterface $logger
+     */
+    public function __construct(IServerContainer $container,
+        LoggerInterface $logger) {
+        $this->container = $container;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUserStatuses(array $userIds): array {
+        $this->setupProvider();
+        if (!$this->provider) {
+            return [];
+        }
+
+        return $this->provider->getUserStatuses($userIds);
+    }
+
+    /**
+     * @param string $class
+     * @since 20.0.0
+     * @internal
+     */
+    public function registerProvider(string $class): void {
+        $this->providerClass = $class;
+        $this->provider = null;
+    }
+
+    /**
+     * Lazily set up provider
+     */
+    private function setupProvider(): void {
+        if ($this->provider !== null) {
+            return;
+        }
+        if ($this->providerClass === null) {
+            return;
+        }
+
+        /**
+         * @psalm-suppress InvalidCatch
+         */
+        try {
+            $provider = $this->container->get($this->providerClass);
+        } catch (ContainerExceptionInterface $e) {
+            $this->logger->error('Could not load user-status "' . $this->providerClass . '" provider dynamically: ' . $e->getMessage(), [
+                'exception' => $e,
+            ]);
+            return;
+        }
+
+        $this->provider = $provider;
+    }
+
+    public function setUserStatus(string $userId, string $messageId, string $status, bool $createBackup = false, ?string $customMessage = null): void {
+        $this->setupProvider();
+        if (!$this->provider || !($this->provider instanceof ISettableProvider)) {
+            return;
+        }
+
+        $this->provider->setUserStatus($userId, $messageId, $status, $createBackup, $customMessage);
+    }
+
+    public function revertUserStatus(string $userId, string $messageId, string $status): void {
+        $this->setupProvider();
+        if (!$this->provider || !($this->provider instanceof ISettableProvider)) {
+            return;
+        }
+        $this->provider->revertUserStatus($userId, $messageId, $status);
+    }
+
+    public function revertMultipleUserStatus(array $userIds, string $messageId, string $status): void {
+        $this->setupProvider();
+        if (!$this->provider || !($this->provider instanceof ISettableProvider)) {
+            return;
+        }
+        $this->provider->revertMultipleUserStatus($userIds, $messageId, $status);
+    }
 }

lib/private/Files/ObjectStore/Mapper.php

Indentation +29 added lines, -29 removed lines

@@ -33,37 +33,37 @@
  * Map a user to a bucket.
  */
 class Mapper {
-	/** @var IUser */
-	private $user;
+    /** @var IUser */
+    private $user;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * Mapper constructor.
-	 *
-	 * @param IUser $user
-	 * @param IConfig $config
-	 */
-	public function __construct(IUser $user, IConfig $config) {
-		$this->user = $user;
-		$this->config = $config;
-	}
+    /**
+     * Mapper constructor.
+     *
+     * @param IUser $user
+     * @param IConfig $config
+     */
+    public function __construct(IUser $user, IConfig $config) {
+        $this->user = $user;
+        $this->config = $config;
+    }
 
-	/**
-	 * @param int $numBuckets
-	 * @return string
-	 */
-	public function getBucket($numBuckets = 64) {
-		// Get the bucket config and shift if provided.
-		// Allow us to prevent writing in old filled buckets
-		$config = $this->config->getSystemValue('objectstore_multibucket');
-		$minBucket = is_array($config) && isset($config['arguments']['min_bucket'])
-			? (int)$config['arguments']['min_bucket']
-			: 0;
+    /**
+     * @param int $numBuckets
+     * @return string
+     */
+    public function getBucket($numBuckets = 64) {
+        // Get the bucket config and shift if provided.
+        // Allow us to prevent writing in old filled buckets
+        $config = $this->config->getSystemValue('objectstore_multibucket');
+        $minBucket = is_array($config) && isset($config['arguments']['min_bucket'])
+            ? (int)$config['arguments']['min_bucket']
+            : 0;
 
-		$hash = md5($this->user->getUID());
-		$num = hexdec(substr($hash, 0, 4));
-		return (string)(($num % ($numBuckets - $minBucket)) + $minBucket);
-	}
+        $hash = md5($this->user->getUID());
+        $num = hexdec(substr($hash, 0, 4));
+        return (string)(($num % ($numBuckets - $minBucket)) + $minBucket);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -59,11 +59,11 @@
 		// Allow us to prevent writing in old filled buckets
 		$config = $this->config->getSystemValue('objectstore_multibucket');
 		$minBucket = is_array($config) && isset($config['arguments']['min_bucket'])
-			? (int)$config['arguments']['min_bucket']
+			? (int) $config['arguments']['min_bucket']
 			: 0;
 
 		$hash = md5($this->user->getUID());
 		$num = hexdec(substr($hash, 0, 4));
-		return (string)(($num % ($numBuckets - $minBucket)) + $minBucket);
+		return (string) (($num % ($numBuckets - $minBucket)) + $minBucket);
 	}
 }

lib/private/Files/AppData/AppData.php

Spacing +7 added lines, -7 removed lines

@@ -76,7 +76,7 @@ 
 			throw new \RuntimeException('no instance id!');
 		}
 
-		return 'appdata_' . $instanceId;
+		return 'appdata_'.$instanceId;
 	}
 
 	protected function getAppDataRootFolder(): Folder {
@@ -104,7 +104,7 @@ 
 			$name = $this->getAppDataFolderName();
 
 			try {
-				$this->folder = $this->rootFolder->get($name . '/' . $this->appId);
+				$this->folder = $this->rootFolder->get($name.'/'.$this->appId);
 			} catch (NotFoundException $e) {
 				$appDataRootFolder = $this->getAppDataRootFolder();
 
@@ -114,7 +114,7 @@ 
 					try {
 						$this->folder = $appDataRootFolder->newFolder($this->appId);
 					} catch (NotPermittedException $e) {
-						throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
+						throw new \RuntimeException('Could not get appdata folder for '.$this->appId);
 					}
 				}
 			}
@@ -124,7 +124,7 @@ 
 	}
 
 	public function getFolder(string $name): ISimpleFolder {
-		$key = $this->appId . '/' . $name;
+		$key = $this->appId.'/'.$name;
 		if ($cachedFolder = $this->folders->get($key)) {
 			if ($cachedFolder instanceof \Exception) {
 				throw $cachedFolder;
@@ -137,7 +137,7 @@ 
 			if ($name === '/') {
 				$node = $this->getAppDataFolder();
 			} else {
-				$path = $this->getAppDataFolderName() . '/' . $this->appId . '/' . $name;
+				$path = $this->getAppDataFolderName().'/'.$this->appId.'/'.$name;
 				$node = $this->rootFolder->get($path);
 			}
 		} catch (NotFoundException $e) {
@@ -152,7 +152,7 @@ 
 	}
 
 	public function newFolder(string $name): ISimpleFolder {
-		$key = $this->appId . '/' . $name;
+		$key = $this->appId.'/'.$name;
 		$folder = $this->getAppDataFolder()->newFolder($name);
 
 		$simpleFolder = new SimpleFolder($folder);
@@ -163,7 +163,7 @@ 
 	public function getDirectoryListing(): array {
 		$listing = $this->getAppDataFolder()->getDirectoryListing();
 
-		$fileListing = array_map(function (Node $folder) {
+		$fileListing = array_map(function(Node $folder) {
 			if ($folder instanceof Folder) {
 				return new SimpleFolder($folder);
 			}

Indentation +131 added lines, -131 removed lines

@@ -20,135 +20,135 @@
 use OCP\Files\SimpleFS\ISimpleFolder;
 
 class AppData implements IAppData {
-	private IRootFolder $rootFolder;
-	private SystemConfig $config;
-	private string $appId;
-	private ?Folder $folder = null;
-	/** @var CappedMemoryCache<ISimpleFolder|NotFoundException> */
-	private CappedMemoryCache $folders;
-
-	/**
-	 * AppData constructor.
-	 *
-	 * @param IRootFolder $rootFolder
-	 * @param SystemConfig $systemConfig
-	 * @param string $appId
-	 */
-	public function __construct(IRootFolder $rootFolder,
-		SystemConfig $systemConfig,
-		string $appId) {
-		$this->rootFolder = $rootFolder;
-		$this->config = $systemConfig;
-		$this->appId = $appId;
-		$this->folders = new CappedMemoryCache();
-	}
-
-	private function getAppDataFolderName() {
-		$instanceId = $this->config->getValue('instanceid', null);
-		if ($instanceId === null) {
-			throw new \RuntimeException('no instance id!');
-		}
-
-		return 'appdata_' . $instanceId;
-	}
-
-	protected function getAppDataRootFolder(): Folder {
-		$name = $this->getAppDataFolderName();
-
-		try {
-			/** @var Folder $node */
-			$node = $this->rootFolder->get($name);
-			return $node;
-		} catch (NotFoundException $e) {
-			try {
-				return $this->rootFolder->newFolder($name);
-			} catch (NotPermittedException $e) {
-				throw new \RuntimeException('Could not get appdata folder');
-			}
-		}
-	}
-
-	/**
-	 * @return Folder
-	 * @throws \RuntimeException
-	 */
-	private function getAppDataFolder(): Folder {
-		if ($this->folder === null) {
-			$name = $this->getAppDataFolderName();
-
-			try {
-				$this->folder = $this->rootFolder->get($name . '/' . $this->appId);
-			} catch (NotFoundException $e) {
-				$appDataRootFolder = $this->getAppDataRootFolder();
-
-				try {
-					$this->folder = $appDataRootFolder->get($this->appId);
-				} catch (NotFoundException $e) {
-					try {
-						$this->folder = $appDataRootFolder->newFolder($this->appId);
-					} catch (NotPermittedException $e) {
-						throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
-					}
-				}
-			}
-		}
-
-		return $this->folder;
-	}
-
-	public function getFolder(string $name): ISimpleFolder {
-		$key = $this->appId . '/' . $name;
-		if ($cachedFolder = $this->folders->get($key)) {
-			if ($cachedFolder instanceof \Exception) {
-				throw $cachedFolder;
-			} else {
-				return $cachedFolder;
-			}
-		}
-		try {
-			// Hardening if somebody wants to retrieve '/'
-			if ($name === '/') {
-				$node = $this->getAppDataFolder();
-			} else {
-				$path = $this->getAppDataFolderName() . '/' . $this->appId . '/' . $name;
-				$node = $this->rootFolder->get($path);
-			}
-		} catch (NotFoundException $e) {
-			$this->folders->set($key, $e);
-			throw $e;
-		}
-
-		/** @var Folder $node */
-		$folder = new SimpleFolder($node);
-		$this->folders->set($key, $folder);
-		return $folder;
-	}
-
-	public function newFolder(string $name): ISimpleFolder {
-		$key = $this->appId . '/' . $name;
-		$folder = $this->getAppDataFolder()->newFolder($name);
-
-		$simpleFolder = new SimpleFolder($folder);
-		$this->folders->set($key, $simpleFolder);
-		return $simpleFolder;
-	}
-
-	public function getDirectoryListing(): array {
-		$listing = $this->getAppDataFolder()->getDirectoryListing();
-
-		$fileListing = array_map(function (Node $folder) {
-			if ($folder instanceof Folder) {
-				return new SimpleFolder($folder);
-			}
-			return null;
-		}, $listing);
-
-		$fileListing = array_filter($fileListing);
-
-		return array_values($fileListing);
-	}
-
-	public function getId(): int {
-		return $this->getAppDataFolder()->getId();
-	}
+    private IRootFolder $rootFolder;
+    private SystemConfig $config;
+    private string $appId;
+    private ?Folder $folder = null;
+    /** @var CappedMemoryCache<ISimpleFolder|NotFoundException> */
+    private CappedMemoryCache $folders;
+
+    /**
+     * AppData constructor.
+     *
+     * @param IRootFolder $rootFolder
+     * @param SystemConfig $systemConfig
+     * @param string $appId
+     */
+    public function __construct(IRootFolder $rootFolder,
+        SystemConfig $systemConfig,
+        string $appId) {
+        $this->rootFolder = $rootFolder;
+        $this->config = $systemConfig;
+        $this->appId = $appId;
+        $this->folders = new CappedMemoryCache();
+    }
+
+    private function getAppDataFolderName() {
+        $instanceId = $this->config->getValue('instanceid', null);
+        if ($instanceId === null) {
+            throw new \RuntimeException('no instance id!');
+        }
+
+        return 'appdata_' . $instanceId;
+    }
+
+    protected function getAppDataRootFolder(): Folder {
+        $name = $this->getAppDataFolderName();
+
+        try {
+            /** @var Folder $node */
+            $node = $this->rootFolder->get($name);
+            return $node;
+        } catch (NotFoundException $e) {
+            try {
+                return $this->rootFolder->newFolder($name);
+            } catch (NotPermittedException $e) {
+                throw new \RuntimeException('Could not get appdata folder');
+            }
+        }
+    }
+
+    /**
+     * @return Folder
+     * @throws \RuntimeException
+     */
+    private function getAppDataFolder(): Folder {
+        if ($this->folder === null) {
+            $name = $this->getAppDataFolderName();
+
+            try {
+                $this->folder = $this->rootFolder->get($name . '/' . $this->appId);
+            } catch (NotFoundException $e) {
+                $appDataRootFolder = $this->getAppDataRootFolder();
+
+                try {
+                    $this->folder = $appDataRootFolder->get($this->appId);
+                } catch (NotFoundException $e) {
+                    try {
+                        $this->folder = $appDataRootFolder->newFolder($this->appId);
+                    } catch (NotPermittedException $e) {
+                        throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
+                    }
+                }
+            }
+        }
+
+        return $this->folder;
+    }
+
+    public function getFolder(string $name): ISimpleFolder {
+        $key = $this->appId . '/' . $name;
+        if ($cachedFolder = $this->folders->get($key)) {
+            if ($cachedFolder instanceof \Exception) {
+                throw $cachedFolder;
+            } else {
+                return $cachedFolder;
+            }
+        }
+        try {
+            // Hardening if somebody wants to retrieve '/'
+            if ($name === '/') {
+                $node = $this->getAppDataFolder();
+            } else {
+                $path = $this->getAppDataFolderName() . '/' . $this->appId . '/' . $name;
+                $node = $this->rootFolder->get($path);
+            }
+        } catch (NotFoundException $e) {
+            $this->folders->set($key, $e);
+            throw $e;
+        }
+
+        /** @var Folder $node */
+        $folder = new SimpleFolder($node);
+        $this->folders->set($key, $folder);
+        return $folder;
+    }
+
+    public function newFolder(string $name): ISimpleFolder {
+        $key = $this->appId . '/' . $name;
+        $folder = $this->getAppDataFolder()->newFolder($name);
+
+        $simpleFolder = new SimpleFolder($folder);
+        $this->folders->set($key, $simpleFolder);
+        return $simpleFolder;
+    }
+
+    public function getDirectoryListing(): array {
+        $listing = $this->getAppDataFolder()->getDirectoryListing();
+
+        $fileListing = array_map(function (Node $folder) {
+            if ($folder instanceof Folder) {
+                return new SimpleFolder($folder);
+            }
+            return null;
+        }, $listing);
+
+        $fileListing = array_filter($fileListing);
+
+        return array_values($fileListing);
+    }
+
+    public function getId(): int {
+        return $this->getAppDataFolder()->getId();
+    }
 }