nextcloud / server

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();
+    }
 }

lib/private/Updater/ChangesCheck.php

Spacing +4 added lines, -4 removed lines

@@ -146,12 +146,12 @@
 				$xml = @simplexml_load_string($body);
 			}
 			if ($xml !== false) {
-				$data['changelogURL'] = (string)$xml->changelog['href'];
+				$data['changelogURL'] = (string) $xml->changelog['href'];
 				$data['whatsNew'] = [];
 				foreach ($xml->whatsNew as $infoSet) {
-					$data['whatsNew'][(string)$infoSet['lang']] = [
-						'regular' => (array)$infoSet->regular->item,
-						'admin' => (array)$infoSet->admin->item,
+					$data['whatsNew'][(string) $infoSet['lang']] = [
+						'regular' => (array) $infoSet->regular->item,
+						'admin' => (array) $infoSet->admin->item,
 					];
 				}
 			} else {

Indentation +141 added lines, -141 removed lines

@@ -14,145 +14,145 @@
 use Psr\Log\LoggerInterface;
 
 class ChangesCheck {
-	/** @var IClientService */
-	protected $clientService;
-	/** @var ChangesMapper */
-	private $mapper;
-	private LoggerInterface $logger;
-
-	public const RESPONSE_NO_CONTENT = 0;
-	public const RESPONSE_USE_CACHE = 1;
-	public const RESPONSE_HAS_CONTENT = 2;
-
-	public function __construct(IClientService $clientService, ChangesMapper $mapper, LoggerInterface $logger) {
-		$this->clientService = $clientService;
-		$this->mapper = $mapper;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @throws DoesNotExistException
-	 * @return array{changelogURL: string, whatsNew: array<string, array{admin: list<string>, regular: list<string>}>}
-	 */
-	public function getChangesForVersion(string $version): array {
-		$version = $this->normalizeVersion($version);
-		$changesInfo = $this->mapper->getChanges($version);
-		$changesData = json_decode($changesInfo->getData(), true);
-		if (empty($changesData)) {
-			throw new DoesNotExistException('Unable to decode changes info');
-		}
-		return $changesData;
-	}
-
-	/**
-	 * @throws \Exception
-	 */
-	public function check(string $uri, string $version): array {
-		try {
-			$version = $this->normalizeVersion($version);
-			$changesInfo = $this->mapper->getChanges($version);
-			if ($changesInfo->getLastCheck() + 1800 > time()) {
-				return json_decode($changesInfo->getData(), true);
-			}
-		} catch (DoesNotExistException $e) {
-			$changesInfo = new Changes();
-		}
-
-		$response = $this->queryChangesServer($uri, $changesInfo);
-
-		switch ($this->evaluateResponse($response)) {
-			case self::RESPONSE_NO_CONTENT:
-				return [];
-			case self::RESPONSE_USE_CACHE:
-				return json_decode($changesInfo->getData(), true);
-			case self::RESPONSE_HAS_CONTENT:
-			default:
-				$data = $this->extractData($response->getBody());
-				$changesInfo->setData(json_encode($data));
-				$changesInfo->setEtag($response->getHeader('Etag'));
-				$this->cacheResult($changesInfo, $version);
-
-				return $data;
-		}
-	}
-
-	protected function evaluateResponse(IResponse $response): int {
-		if ($response->getStatusCode() === 304) {
-			return self::RESPONSE_USE_CACHE;
-		} elseif ($response->getStatusCode() === 404) {
-			return self::RESPONSE_NO_CONTENT;
-		} elseif ($response->getStatusCode() === 200) {
-			return self::RESPONSE_HAS_CONTENT;
-		}
-		$this->logger->debug('Unexpected return code {code} from changelog server', [
-			'app' => 'core',
-			'code' => $response->getStatusCode(),
-		]);
-		return self::RESPONSE_NO_CONTENT;
-	}
-
-	protected function cacheResult(Changes $entry, string $version) {
-		if ($entry->getVersion() === $version) {
-			$this->mapper->update($entry);
-		} else {
-			$entry->setVersion($version);
-			$this->mapper->insert($entry);
-		}
-	}
-
-	/**
-	 * @throws \Exception
-	 */
-	protected function queryChangesServer(string $uri, Changes $entry): IResponse {
-		$headers = [];
-		if ($entry->getEtag() !== '') {
-			$headers['If-None-Match'] = [$entry->getEtag()];
-		}
-
-		$entry->setLastCheck(time());
-		$client = $this->clientService->newClient();
-		return $client->get($uri, [
-			'headers' => $headers,
-		]);
-	}
-
-	protected function extractData($body):array {
-		$data = [];
-		if ($body) {
-			if (\LIBXML_VERSION < 20900) {
-				$loadEntities = libxml_disable_entity_loader(true);
-				$xml = @simplexml_load_string($body);
-				libxml_disable_entity_loader($loadEntities);
-			} else {
-				$xml = @simplexml_load_string($body);
-			}
-			if ($xml !== false) {
-				$data['changelogURL'] = (string)$xml->changelog['href'];
-				$data['whatsNew'] = [];
-				foreach ($xml->whatsNew as $infoSet) {
-					$data['whatsNew'][(string)$infoSet['lang']] = [
-						'regular' => (array)$infoSet->regular->item,
-						'admin' => (array)$infoSet->admin->item,
-					];
-				}
-			} else {
-				libxml_clear_errors();
-			}
-		}
-		return $data;
-	}
-
-	/**
-	 * returns a x.y.z form of the provided version. Extra numbers will be
-	 * omitted, missing ones added as zeros.
-	 */
-	public function normalizeVersion(string $version): string {
-		$versionNumbers = array_slice(explode('.', $version), 0, 3);
-		$versionNumbers[0] = $versionNumbers[0] ?: '0'; // deal with empty input
-		while (count($versionNumbers) < 3) {
-			// changelog server expects x.y.z, pad 0 if it is too short
-			$versionNumbers[] = 0;
-		}
-		return implode('.', $versionNumbers);
-	}
+    /** @var IClientService */
+    protected $clientService;
+    /** @var ChangesMapper */
+    private $mapper;
+    private LoggerInterface $logger;
+
+    public const RESPONSE_NO_CONTENT = 0;
+    public const RESPONSE_USE_CACHE = 1;
+    public const RESPONSE_HAS_CONTENT = 2;
+
+    public function __construct(IClientService $clientService, ChangesMapper $mapper, LoggerInterface $logger) {
+        $this->clientService = $clientService;
+        $this->mapper = $mapper;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @throws DoesNotExistException
+     * @return array{changelogURL: string, whatsNew: array<string, array{admin: list<string>, regular: list<string>}>}
+     */
+    public function getChangesForVersion(string $version): array {
+        $version = $this->normalizeVersion($version);
+        $changesInfo = $this->mapper->getChanges($version);
+        $changesData = json_decode($changesInfo->getData(), true);
+        if (empty($changesData)) {
+            throw new DoesNotExistException('Unable to decode changes info');
+        }
+        return $changesData;
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function check(string $uri, string $version): array {
+        try {
+            $version = $this->normalizeVersion($version);
+            $changesInfo = $this->mapper->getChanges($version);
+            if ($changesInfo->getLastCheck() + 1800 > time()) {
+                return json_decode($changesInfo->getData(), true);
+            }
+        } catch (DoesNotExistException $e) {
+            $changesInfo = new Changes();
+        }
+
+        $response = $this->queryChangesServer($uri, $changesInfo);
+
+        switch ($this->evaluateResponse($response)) {
+            case self::RESPONSE_NO_CONTENT:
+                return [];
+            case self::RESPONSE_USE_CACHE:
+                return json_decode($changesInfo->getData(), true);
+            case self::RESPONSE_HAS_CONTENT:
+            default:
+                $data = $this->extractData($response->getBody());
+                $changesInfo->setData(json_encode($data));
+                $changesInfo->setEtag($response->getHeader('Etag'));
+                $this->cacheResult($changesInfo, $version);
+
+                return $data;
+        }
+    }
+
+    protected function evaluateResponse(IResponse $response): int {
+        if ($response->getStatusCode() === 304) {
+            return self::RESPONSE_USE_CACHE;
+        } elseif ($response->getStatusCode() === 404) {
+            return self::RESPONSE_NO_CONTENT;
+        } elseif ($response->getStatusCode() === 200) {
+            return self::RESPONSE_HAS_CONTENT;
+        }
+        $this->logger->debug('Unexpected return code {code} from changelog server', [
+            'app' => 'core',
+            'code' => $response->getStatusCode(),
+        ]);
+        return self::RESPONSE_NO_CONTENT;
+    }
+
+    protected function cacheResult(Changes $entry, string $version) {
+        if ($entry->getVersion() === $version) {
+            $this->mapper->update($entry);
+        } else {
+            $entry->setVersion($version);
+            $this->mapper->insert($entry);
+        }
+    }
+
+    /**
+     * @throws \Exception
+     */
+    protected function queryChangesServer(string $uri, Changes $entry): IResponse {
+        $headers = [];
+        if ($entry->getEtag() !== '') {
+            $headers['If-None-Match'] = [$entry->getEtag()];
+        }
+
+        $entry->setLastCheck(time());
+        $client = $this->clientService->newClient();
+        return $client->get($uri, [
+            'headers' => $headers,
+        ]);
+    }
+
+    protected function extractData($body):array {
+        $data = [];
+        if ($body) {
+            if (\LIBXML_VERSION < 20900) {
+                $loadEntities = libxml_disable_entity_loader(true);
+                $xml = @simplexml_load_string($body);
+                libxml_disable_entity_loader($loadEntities);
+            } else {
+                $xml = @simplexml_load_string($body);
+            }
+            if ($xml !== false) {
+                $data['changelogURL'] = (string)$xml->changelog['href'];
+                $data['whatsNew'] = [];
+                foreach ($xml->whatsNew as $infoSet) {
+                    $data['whatsNew'][(string)$infoSet['lang']] = [
+                        'regular' => (array)$infoSet->regular->item,
+                        'admin' => (array)$infoSet->admin->item,
+                    ];
+                }
+            } else {
+                libxml_clear_errors();
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * returns a x.y.z form of the provided version. Extra numbers will be
+     * omitted, missing ones added as zeros.
+     */
+    public function normalizeVersion(string $version): string {
+        $versionNumbers = array_slice(explode('.', $version), 0, 3);
+        $versionNumbers[0] = $versionNumbers[0] ?: '0'; // deal with empty input
+        while (count($versionNumbers) < 3) {
+            // changelog server expects x.y.z, pad 0 if it is too short
+            $versionNumbers[] = 0;
+        }
+        return implode('.', $versionNumbers);
+    }
 }

lib/private/Settings/AuthorizedGroupMapper.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 
 		$result = $qb->select('class')
 			->from($this->getTableName(), 'auth')
-			->where($qb->expr()->in('group_id', array_map(function (IGroup $group) use ($qb) {
+			->where($qb->expr()->in('group_id', array_map(function(IGroup $group) use ($qb) {
 				return $qb->createNamedParameter($group->getGID());
 			}, $groups), IQueryBuilder::PARAM_STR))
 			->executeQuery();

Indentation +80 added lines, -80 removed lines

@@ -36,93 +36,93 @@
  * @template-extends QBMapper<AuthorizedGroup>
  */
 class AuthorizedGroupMapper extends QBMapper {
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'authorized_groups', AuthorizedGroup::class);
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'authorized_groups', AuthorizedGroup::class);
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	public function findAllClassesForUser(IUser $user): array {
-		$qb = $this->db->getQueryBuilder();
+    /**
+     * @throws Exception
+     */
+    public function findAllClassesForUser(IUser $user): array {
+        $qb = $this->db->getQueryBuilder();
 
-		/** @var IGroupManager $groupManager */
-		$groupManager = \OC::$server->get(IGroupManager::class);
-		$groups = $groupManager->getUserGroups($user);
-		if (count($groups) === 0) {
-			return [];
-		}
+        /** @var IGroupManager $groupManager */
+        $groupManager = \OC::$server->get(IGroupManager::class);
+        $groups = $groupManager->getUserGroups($user);
+        if (count($groups) === 0) {
+            return [];
+        }
 
-		$result = $qb->select('class')
-			->from($this->getTableName(), 'auth')
-			->where($qb->expr()->in('group_id', array_map(function (IGroup $group) use ($qb) {
-				return $qb->createNamedParameter($group->getGID());
-			}, $groups), IQueryBuilder::PARAM_STR))
-			->executeQuery();
+        $result = $qb->select('class')
+            ->from($this->getTableName(), 'auth')
+            ->where($qb->expr()->in('group_id', array_map(function (IGroup $group) use ($qb) {
+                return $qb->createNamedParameter($group->getGID());
+            }, $groups), IQueryBuilder::PARAM_STR))
+            ->executeQuery();
 
-		$classes = [];
-		while ($row = $result->fetch()) {
-			$classes[] = $row['class'];
-		}
-		$result->closeCursor();
-		return $classes;
-	}
+        $classes = [];
+        while ($row = $result->fetch()) {
+            $classes[] = $row['class'];
+        }
+        $result->closeCursor();
+        return $classes;
+    }
 
-	/**
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException
-	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
-	 * @throws \OCP\DB\Exception
-	 */
-	public function find(int $id): AuthorizedGroup {
-		$queryBuilder = $this->db->getQueryBuilder();
-		$queryBuilder->select('*')
-			->from($this->getTableName())
-			->where($queryBuilder->expr()->eq('id', $queryBuilder->createNamedParameter($id)));
-		/** @var AuthorizedGroup $authorizedGroup */
-		$authorizedGroup = $this->findEntity($queryBuilder);
-		return $authorizedGroup;
-	}
+    /**
+     * @throws \OCP\AppFramework\Db\DoesNotExistException
+     * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
+     * @throws \OCP\DB\Exception
+     */
+    public function find(int $id): AuthorizedGroup {
+        $queryBuilder = $this->db->getQueryBuilder();
+        $queryBuilder->select('*')
+            ->from($this->getTableName())
+            ->where($queryBuilder->expr()->eq('id', $queryBuilder->createNamedParameter($id)));
+        /** @var AuthorizedGroup $authorizedGroup */
+        $authorizedGroup = $this->findEntity($queryBuilder);
+        return $authorizedGroup;
+    }
 
-	/**
-	 * Get all the authorizations stored in the database.
-	 *
-	 * @return AuthorizedGroup[]
-	 * @throws \OCP\DB\Exception
-	 */
-	public function findAll(): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')->from($this->getTableName());
-		return $this->findEntities($qb);
-	}
+    /**
+     * Get all the authorizations stored in the database.
+     *
+     * @return AuthorizedGroup[]
+     * @throws \OCP\DB\Exception
+     */
+    public function findAll(): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')->from($this->getTableName());
+        return $this->findEntities($qb);
+    }
 
-	public function findByGroupIdAndClass(string $groupId, string $class) {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('group_id', $qb->createNamedParameter($groupId)))
-			->andWhere($qb->expr()->eq('class', $qb->createNamedParameter($class)));
-		return $this->findEntity($qb);
-	}
+    public function findByGroupIdAndClass(string $groupId, string $class) {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('group_id', $qb->createNamedParameter($groupId)))
+            ->andWhere($qb->expr()->eq('class', $qb->createNamedParameter($class)));
+        return $this->findEntity($qb);
+    }
 
-	/**
-	 * @return Entity[]
-	 * @throws \OCP\DB\Exception
-	 */
-	public function findExistingGroupsForClass(string $class): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('class', $qb->createNamedParameter($class)));
-		return $this->findEntities($qb);
-	}
+    /**
+     * @return Entity[]
+     * @throws \OCP\DB\Exception
+     */
+    public function findExistingGroupsForClass(string $class): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('class', $qb->createNamedParameter($class)));
+        return $this->findEntities($qb);
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	public function removeGroup(string $gid) {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->getTableName())
-			->where($qb->expr()->eq('group_id', $qb->createNamedParameter($gid)))
-			->executeStatement();
-	}
+    /**
+     * @throws Exception
+     */
+    public function removeGroup(string $gid) {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->getTableName())
+            ->where($qb->expr()->eq('group_id', $qb->createNamedParameter($gid)))
+            ->executeStatement();
+    }
 }

lib/private/Contacts/ContactsMenu/ActionFactory.php

Spacing +1 added lines, -1 removed lines

@@ -44,6 +44,6 @@
 	 * {@inheritDoc}
 	 */
 	public function newEMailAction(string $icon, string $name, string $email, string $appId = ''): ILinkAction {
-		return $this->newLinkAction($icon, $name, 'mailto:' . $email, $appId);
+		return $this->newLinkAction($icon, $name, 'mailto:'.$email, $appId);
 	}
 }

Indentation +17 added lines, -17 removed lines

@@ -27,22 +27,22 @@
 use OCP\Contacts\ContactsMenu\ILinkAction;
 
 class ActionFactory implements IActionFactory {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function newLinkAction(string $icon, string $name, string $href, string $appId = ''): ILinkAction {
-		$action = new LinkAction();
-		$action->setName($name);
-		$action->setIcon($icon);
-		$action->setHref($href);
-		$action->setAppId($appId);
-		return $action;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function newLinkAction(string $icon, string $name, string $href, string $appId = ''): ILinkAction {
+        $action = new LinkAction();
+        $action->setName($name);
+        $action->setIcon($icon);
+        $action->setHref($href);
+        $action->setAppId($appId);
+        return $action;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function newEMailAction(string $icon, string $name, string $email, string $appId = ''): ILinkAction {
-		return $this->newLinkAction($icon, $name, 'mailto:' . $email, $appId);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function newEMailAction(string $icon, string $name, string $email, string $appId = ''): ILinkAction {
+        return $this->newLinkAction($icon, $name, 'mailto:' . $email, $appId);
+    }
 }