nextcloud / server

apps/files_external/lib/Lib/Backend/Backend.php

Indentation +98 added lines, -98 removed lines

@@ -59,102 +59,102 @@
  *      Object can affect storage mounting
  */
 class Backend implements \JsonSerializable, IIdentifier, IFrontendDefinition {
-	use VisibilityTrait;
-	use FrontendDefinitionTrait;
-	use PriorityTrait;
-	use DependencyTrait;
-	use StorageModifierTrait;
-	use IdentifierTrait;
-
-	/** @var string storage class */
-	private $storageClass;
-
-	/** @var array 'scheme' => true, supported authentication schemes */
-	private $authSchemes = [];
-
-	/** @var AuthMechanism|callable authentication mechanism fallback */
-	private $legacyAuthMechanism;
-
-	/**
-	 * @return class-string<IStorage>
-	 */
-	public function getStorageClass() {
-		return $this->storageClass;
-	}
-
-	/**
-	 * @param string $class
-	 * @return $this
-	 */
-	public function setStorageClass($class) {
-		$this->storageClass = $class;
-		return $this;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAuthSchemes() {
-		if (empty($this->authSchemes)) {
-			return [AuthMechanism::SCHEME_NULL => true];
-		}
-		return $this->authSchemes;
-	}
-
-	/**
-	 * @param string $scheme
-	 * @return self
-	 */
-	public function addAuthScheme($scheme) {
-		$this->authSchemes[$scheme] = true;
-		return $this;
-	}
-
-	/**
-	 * @param array $parameters storage parameters, for dynamic mechanism selection
-	 * @return AuthMechanism
-	 */
-	public function getLegacyAuthMechanism(array $parameters = []) {
-		if (is_callable($this->legacyAuthMechanism)) {
-			return call_user_func($this->legacyAuthMechanism, $parameters);
-		}
-		return $this->legacyAuthMechanism;
-	}
-
-	public function setLegacyAuthMechanism(AuthMechanism $authMechanism): self {
-		$this->legacyAuthMechanism = $authMechanism;
-		return $this;
-	}
-
-	/**
-	 * @param callable $callback dynamic auth mechanism selection
-	 */
-	public function setLegacyAuthMechanismCallback(callable $callback): self {
-		$this->legacyAuthMechanism = $callback;
-		return $this;
-	}
-
-	/**
-	 * Serialize into JSON for client-side JS
-	 */
-	public function jsonSerialize(): array {
-		$data = $this->jsonSerializeDefinition();
-		$data += $this->jsonSerializeIdentifier();
-
-		$data['backend'] = $data['name']; // legacy compat
-		$data['priority'] = $this->getPriority();
-		$data['authSchemes'] = $this->getAuthSchemes();
-
-		return $data;
-	}
-
-	/**
-	 * Check if parameters are satisfied in a StorageConfig
-	 *
-	 * @param StorageConfig $storage
-	 * @return bool
-	 */
-	public function validateStorage(StorageConfig $storage) {
-		return $this->validateStorageDefinition($storage);
-	}
+    use VisibilityTrait;
+    use FrontendDefinitionTrait;
+    use PriorityTrait;
+    use DependencyTrait;
+    use StorageModifierTrait;
+    use IdentifierTrait;
+
+    /** @var string storage class */
+    private $storageClass;
+
+    /** @var array 'scheme' => true, supported authentication schemes */
+    private $authSchemes = [];
+
+    /** @var AuthMechanism|callable authentication mechanism fallback */
+    private $legacyAuthMechanism;
+
+    /**
+     * @return class-string<IStorage>
+     */
+    public function getStorageClass() {
+        return $this->storageClass;
+    }
+
+    /**
+     * @param string $class
+     * @return $this
+     */
+    public function setStorageClass($class) {
+        $this->storageClass = $class;
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAuthSchemes() {
+        if (empty($this->authSchemes)) {
+            return [AuthMechanism::SCHEME_NULL => true];
+        }
+        return $this->authSchemes;
+    }
+
+    /**
+     * @param string $scheme
+     * @return self
+     */
+    public function addAuthScheme($scheme) {
+        $this->authSchemes[$scheme] = true;
+        return $this;
+    }
+
+    /**
+     * @param array $parameters storage parameters, for dynamic mechanism selection
+     * @return AuthMechanism
+     */
+    public function getLegacyAuthMechanism(array $parameters = []) {
+        if (is_callable($this->legacyAuthMechanism)) {
+            return call_user_func($this->legacyAuthMechanism, $parameters);
+        }
+        return $this->legacyAuthMechanism;
+    }
+
+    public function setLegacyAuthMechanism(AuthMechanism $authMechanism): self {
+        $this->legacyAuthMechanism = $authMechanism;
+        return $this;
+    }
+
+    /**
+     * @param callable $callback dynamic auth mechanism selection
+     */
+    public function setLegacyAuthMechanismCallback(callable $callback): self {
+        $this->legacyAuthMechanism = $callback;
+        return $this;
+    }
+
+    /**
+     * Serialize into JSON for client-side JS
+     */
+    public function jsonSerialize(): array {
+        $data = $this->jsonSerializeDefinition();
+        $data += $this->jsonSerializeIdentifier();
+
+        $data['backend'] = $data['name']; // legacy compat
+        $data['priority'] = $this->getPriority();
+        $data['authSchemes'] = $this->getAuthSchemes();
+
+        return $data;
+    }
+
+    /**
+     * Check if parameters are satisfied in a StorageConfig
+     *
+     * @param StorageConfig $storage
+     * @return bool
+     */
+    public function validateStorage(StorageConfig $storage) {
+        return $this->validateStorageDefinition($storage);
+    }
 }

apps/files_external/lib/Lib/IIdentifier.php

Indentation +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@
 
 interface IIdentifier {
 
-	public function getIdentifier(): string;
+    public function getIdentifier(): string;
 
-	public function setIdentifier(string $identifier): self;
+    public function setIdentifier(string $identifier): self;
 }

apps/files_external/lib/Command/ListCommand.php

Spacing +10 added lines, -10 removed lines

@@ -87,7 +87,7 @@ 
 			$mounts = $this->globalService->getStorageForAllUsers();
 			$userId = self::ALL;
 		} else {
-			$userId = (string)$input->getArgument('user_id');
+			$userId = (string) $input->getArgument('user_id');
 			$storageService = $this->getStorageService($userId);
 			$mounts = $storageService->getAllStorages();
 		}
@@ -140,11 +140,11 @@ 
 		}
 
 		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$keys = array_map(function ($header) {
+			$keys = array_map(function($header) {
 				return strtolower(str_replace(' ', '_', $header));
 			}, $headers);
 
-			$pairs = array_map(function (StorageConfig $config) use ($keys, $userId) {
+			$pairs = array_map(function(StorageConfig $config) use ($keys, $userId) {
 				$values = [
 					$config->getId(),
 					$config->getMountPoint(),
@@ -178,23 +178,23 @@ 
 				'encoding_compatibility' => false,
 				'readonly' => false,
 			];
-			$rows = array_map(function (StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
+			$rows = array_map(function(StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
 				$storageConfig = $config->getBackendOptions();
 				$keys = array_keys($storageConfig);
 				$values = array_values($storageConfig);
 
 				if (!$full) {
-					$values = array_map(function ($value) {
+					$values = array_map(function($value) {
 						if (is_string($value) && strlen($value) > 32) {
-							return substr($value, 0, 6) . '...' . substr($value, -6, 6);
+							return substr($value, 0, 6).'...'.substr($value, -6, 6);
 						} else {
 							return $value;
 						}
 					}, $values);
 				}
 
-				$configStrings = array_map(function ($key, $value) {
-					return $key . ': ' . json_encode($value);
+				$configStrings = array_map(function($key, $value) {
+					return $key.': '.json_encode($value);
 				}, $keys, $values);
 				$configString = implode(', ', $configStrings);
 
@@ -208,8 +208,8 @@ 
 				$keys = array_keys($mountOptions);
 				$values = array_values($mountOptions);
 
-				$optionsStrings = array_map(function ($key, $value) {
-					return $key . ': ' . json_encode($value);
+				$optionsStrings = array_map(function($key, $value) {
+					return $key.': '.json_encode($value);
 				}, $keys, $values);
 				$optionsString = implode(', ', $optionsStrings);
 

Indentation +214 added lines, -214 removed lines

@@ -21,218 +21,218 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCommand extends Base {
-	public const ALL = -1;
-
-	public function __construct(
-		protected GlobalStoragesService $globalService,
-		protected UserStoragesService $userService,
-		protected IUserSession $userSession,
-		protected IUserManager $userManager,
-	) {
-		parent::__construct();
-	}
-
-	protected function configure(): void {
-		$this
-			->setName('files_external:list')
-			->setDescription('List configured admin or personal mounts')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL,
-				'user id to list the personal mounts for, if no user is provided admin mounts will be listed'
-			)->addOption(
-				'show-password',
-				'',
-				InputOption::VALUE_NONE,
-				'show passwords and secrets'
-			)->addOption(
-				'full',
-				null,
-				InputOption::VALUE_NONE,
-				'don\'t truncate long values in table output'
-			)->addOption(
-				'all',
-				'a',
-				InputOption::VALUE_NONE,
-				'show both system wide mounts and all personal mounts'
-			);
-		parent::configure();
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		/** @var StorageConfig[] $mounts */
-		if ($input->getOption('all')) {
-			$mounts = $this->globalService->getStorageForAllUsers();
-			$userId = self::ALL;
-		} else {
-			$userId = (string)$input->getArgument('user_id');
-			$storageService = $this->getStorageService($userId);
-			$mounts = $storageService->getAllStorages();
-		}
-
-		$this->listMounts($userId, $mounts, $input, $output);
-		return self::SUCCESS;
-	}
-
-	/**
-	 * @param ?string|ListCommand::ALL $userId
-	 * @param StorageConfig[] $mounts
-	 */
-	public function listMounts($userId, array $mounts, InputInterface $input, OutputInterface $output): void {
-		$outputType = $input->getOption('output');
-		if (count($mounts) === 0) {
-			if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-				$output->writeln('[]');
-			} else {
-				if ($userId === self::ALL) {
-					$output->writeln('<info>No mounts configured</info>');
-				} elseif ($userId) {
-					$output->writeln("<info>No mounts configured by $userId</info>");
-				} else {
-					$output->writeln('<info>No admin mounts configured</info>');
-				}
-			}
-			return;
-		}
-
-		$headers = ['Mount ID', 'Mount Point', 'Storage', 'Authentication Type', 'Configuration', 'Options'];
-
-		if (!$userId || $userId === self::ALL) {
-			$headers[] = 'Applicable Users';
-			$headers[] = 'Applicable Groups';
-		}
-		if ($userId === self::ALL) {
-			$headers[] = 'Type';
-		}
-
-		if (!$input->getOption('show-password')) {
-			$hideKeys = ['key', 'bucket', 'secret', 'password', 'refresh_token', 'token', 'client_secret', 'public_key', 'private_key'];
-			foreach ($mounts as $mount) {
-				$config = $mount->getBackendOptions();
-				foreach ($config as $key => $value) {
-					if (in_array($key, $hideKeys)) {
-						$mount->setBackendOption($key, '***REMOVED SENSITIVE VALUE***');
-					}
-				}
-			}
-		}
-
-		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$keys = array_map(function ($header) {
-				return strtolower(str_replace(' ', '_', $header));
-			}, $headers);
-
-			$pairs = array_map(function (StorageConfig $config) use ($keys, $userId) {
-				$values = [
-					$config->getId(),
-					$config->getMountPoint(),
-					$config->getBackend()->getStorageClass(),
-					$config->getAuthMechanism()->getIdentifier(),
-					$config->getBackendOptions(),
-					$config->getMountOptions()
-				];
-				if (!$userId || $userId === self::ALL) {
-					$values[] = $config->getApplicableUsers();
-					$values[] = $config->getApplicableGroups();
-				}
-				if ($userId === self::ALL) {
-					$values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'admin' : 'personal';
-				}
-
-				return array_combine($keys, $values);
-			}, $mounts);
-			if ($outputType === self::OUTPUT_FORMAT_JSON) {
-				$output->writeln(json_encode(array_values($pairs)));
-			} else {
-				$output->writeln(json_encode(array_values($pairs), JSON_PRETTY_PRINT));
-			}
-		} else {
-			$full = $input->getOption('full');
-			$defaultMountOptions = [
-				'encrypt' => true,
-				'previews' => true,
-				'filesystem_check_changes' => 1,
-				'enable_sharing' => false,
-				'encoding_compatibility' => false,
-				'readonly' => false,
-			];
-			$rows = array_map(function (StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
-				$storageConfig = $config->getBackendOptions();
-				$keys = array_keys($storageConfig);
-				$values = array_values($storageConfig);
-
-				if (!$full) {
-					$values = array_map(function ($value) {
-						if (is_string($value) && strlen($value) > 32) {
-							return substr($value, 0, 6) . '...' . substr($value, -6, 6);
-						} else {
-							return $value;
-						}
-					}, $values);
-				}
-
-				$configStrings = array_map(function ($key, $value) {
-					return $key . ': ' . json_encode($value);
-				}, $keys, $values);
-				$configString = implode(', ', $configStrings);
-
-				$mountOptions = $config->getMountOptions();
-				// hide defaults
-				foreach ($mountOptions as $key => $value) {
-					if ($value === $defaultMountOptions[$key]) {
-						unset($mountOptions[$key]);
-					}
-				}
-				$keys = array_keys($mountOptions);
-				$values = array_values($mountOptions);
-
-				$optionsStrings = array_map(function ($key, $value) {
-					return $key . ': ' . json_encode($value);
-				}, $keys, $values);
-				$optionsString = implode(', ', $optionsStrings);
-
-				$values = [
-					$config->getId(),
-					$config->getMountPoint(),
-					$config->getBackend()->getText(),
-					$config->getAuthMechanism()->getText(),
-					$configString,
-					$optionsString
-				];
-
-				if (!$userId || $userId === self::ALL) {
-					$applicableUsers = implode(', ', $config->getApplicableUsers());
-					$applicableGroups = implode(', ', $config->getApplicableGroups());
-					if ($applicableUsers === '' && $applicableGroups === '') {
-						$applicableUsers = 'All';
-					}
-					$values[] = $applicableUsers;
-					$values[] = $applicableGroups;
-				}
-				if ($userId === self::ALL) {
-					$values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'Admin' : 'Personal';
-				}
-
-				return $values;
-			}, $mounts);
-
-			$table = new Table($output);
-			$table->setHeaders($headers);
-			$table->setRows($rows);
-			$table->render();
-		}
-	}
-
-	protected function getStorageService(string $userId): StoragesService {
-		if (empty($userId)) {
-			return $this->globalService;
-		}
-
-		$user = $this->userManager->get($userId);
-		if (is_null($user)) {
-			throw new NoUserException("user $userId not found");
-		}
-		$this->userSession->setUser($user);
-		return $this->userService;
-	}
+    public const ALL = -1;
+
+    public function __construct(
+        protected GlobalStoragesService $globalService,
+        protected UserStoragesService $userService,
+        protected IUserSession $userSession,
+        protected IUserManager $userManager,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void {
+        $this
+            ->setName('files_external:list')
+            ->setDescription('List configured admin or personal mounts')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL,
+                'user id to list the personal mounts for, if no user is provided admin mounts will be listed'
+            )->addOption(
+                'show-password',
+                '',
+                InputOption::VALUE_NONE,
+                'show passwords and secrets'
+            )->addOption(
+                'full',
+                null,
+                InputOption::VALUE_NONE,
+                'don\'t truncate long values in table output'
+            )->addOption(
+                'all',
+                'a',
+                InputOption::VALUE_NONE,
+                'show both system wide mounts and all personal mounts'
+            );
+        parent::configure();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        /** @var StorageConfig[] $mounts */
+        if ($input->getOption('all')) {
+            $mounts = $this->globalService->getStorageForAllUsers();
+            $userId = self::ALL;
+        } else {
+            $userId = (string)$input->getArgument('user_id');
+            $storageService = $this->getStorageService($userId);
+            $mounts = $storageService->getAllStorages();
+        }
+
+        $this->listMounts($userId, $mounts, $input, $output);
+        return self::SUCCESS;
+    }
+
+    /**
+     * @param ?string|ListCommand::ALL $userId
+     * @param StorageConfig[] $mounts
+     */
+    public function listMounts($userId, array $mounts, InputInterface $input, OutputInterface $output): void {
+        $outputType = $input->getOption('output');
+        if (count($mounts) === 0) {
+            if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+                $output->writeln('[]');
+            } else {
+                if ($userId === self::ALL) {
+                    $output->writeln('<info>No mounts configured</info>');
+                } elseif ($userId) {
+                    $output->writeln("<info>No mounts configured by $userId</info>");
+                } else {
+                    $output->writeln('<info>No admin mounts configured</info>');
+                }
+            }
+            return;
+        }
+
+        $headers = ['Mount ID', 'Mount Point', 'Storage', 'Authentication Type', 'Configuration', 'Options'];
+
+        if (!$userId || $userId === self::ALL) {
+            $headers[] = 'Applicable Users';
+            $headers[] = 'Applicable Groups';
+        }
+        if ($userId === self::ALL) {
+            $headers[] = 'Type';
+        }
+
+        if (!$input->getOption('show-password')) {
+            $hideKeys = ['key', 'bucket', 'secret', 'password', 'refresh_token', 'token', 'client_secret', 'public_key', 'private_key'];
+            foreach ($mounts as $mount) {
+                $config = $mount->getBackendOptions();
+                foreach ($config as $key => $value) {
+                    if (in_array($key, $hideKeys)) {
+                        $mount->setBackendOption($key, '***REMOVED SENSITIVE VALUE***');
+                    }
+                }
+            }
+        }
+
+        if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+            $keys = array_map(function ($header) {
+                return strtolower(str_replace(' ', '_', $header));
+            }, $headers);
+
+            $pairs = array_map(function (StorageConfig $config) use ($keys, $userId) {
+                $values = [
+                    $config->getId(),
+                    $config->getMountPoint(),
+                    $config->getBackend()->getStorageClass(),
+                    $config->getAuthMechanism()->getIdentifier(),
+                    $config->getBackendOptions(),
+                    $config->getMountOptions()
+                ];
+                if (!$userId || $userId === self::ALL) {
+                    $values[] = $config->getApplicableUsers();
+                    $values[] = $config->getApplicableGroups();
+                }
+                if ($userId === self::ALL) {
+                    $values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'admin' : 'personal';
+                }
+
+                return array_combine($keys, $values);
+            }, $mounts);
+            if ($outputType === self::OUTPUT_FORMAT_JSON) {
+                $output->writeln(json_encode(array_values($pairs)));
+            } else {
+                $output->writeln(json_encode(array_values($pairs), JSON_PRETTY_PRINT));
+            }
+        } else {
+            $full = $input->getOption('full');
+            $defaultMountOptions = [
+                'encrypt' => true,
+                'previews' => true,
+                'filesystem_check_changes' => 1,
+                'enable_sharing' => false,
+                'encoding_compatibility' => false,
+                'readonly' => false,
+            ];
+            $rows = array_map(function (StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
+                $storageConfig = $config->getBackendOptions();
+                $keys = array_keys($storageConfig);
+                $values = array_values($storageConfig);
+
+                if (!$full) {
+                    $values = array_map(function ($value) {
+                        if (is_string($value) && strlen($value) > 32) {
+                            return substr($value, 0, 6) . '...' . substr($value, -6, 6);
+                        } else {
+                            return $value;
+                        }
+                    }, $values);
+                }
+
+                $configStrings = array_map(function ($key, $value) {
+                    return $key . ': ' . json_encode($value);
+                }, $keys, $values);
+                $configString = implode(', ', $configStrings);
+
+                $mountOptions = $config->getMountOptions();
+                // hide defaults
+                foreach ($mountOptions as $key => $value) {
+                    if ($value === $defaultMountOptions[$key]) {
+                        unset($mountOptions[$key]);
+                    }
+                }
+                $keys = array_keys($mountOptions);
+                $values = array_values($mountOptions);
+
+                $optionsStrings = array_map(function ($key, $value) {
+                    return $key . ': ' . json_encode($value);
+                }, $keys, $values);
+                $optionsString = implode(', ', $optionsStrings);
+
+                $values = [
+                    $config->getId(),
+                    $config->getMountPoint(),
+                    $config->getBackend()->getText(),
+                    $config->getAuthMechanism()->getText(),
+                    $configString,
+                    $optionsString
+                ];
+
+                if (!$userId || $userId === self::ALL) {
+                    $applicableUsers = implode(', ', $config->getApplicableUsers());
+                    $applicableGroups = implode(', ', $config->getApplicableGroups());
+                    if ($applicableUsers === '' && $applicableGroups === '') {
+                        $applicableUsers = 'All';
+                    }
+                    $values[] = $applicableUsers;
+                    $values[] = $applicableGroups;
+                }
+                if ($userId === self::ALL) {
+                    $values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'Admin' : 'Personal';
+                }
+
+                return $values;
+            }, $mounts);
+
+            $table = new Table($output);
+            $table->setHeaders($headers);
+            $table->setRows($rows);
+            $table->render();
+        }
+    }
+
+    protected function getStorageService(string $userId): StoragesService {
+        if (empty($userId)) {
+            return $this->globalService;
+        }
+
+        $user = $this->userManager->get($userId);
+        if (is_null($user)) {
+            throw new NoUserException("user $userId not found");
+        }
+        $this->userSession->setUser($user);
+        return $this->userService;
+    }
 }

lib/public/Support/Subscription/IAssertion.php

Indentation +9 added lines, -9 removed lines

@@ -32,13 +32,13 @@
  * @since 26.0.0
  */
 interface IAssertion {
-	/**
-	 * This method throws a localized exception when user limits are exceeded,
-	 * if applicable. Notifications are also created in that case. It is a
-	 * shorthand for a check against IRegistry::delegateIsHardUserLimitReached().
-	 *
-	 * @throws HintException
-	 * @since 26.0.0
-	 */
-	public function createUserIsLegit(): void;
+    /**
+     * This method throws a localized exception when user limits are exceeded,
+     * if applicable. Notifications are also created in that case. It is a
+     * shorthand for a check against IRegistry::delegateIsHardUserLimitReached().
+     *
+     * @throws HintException
+     * @since 26.0.0
+     */
+    public function createUserIsLegit(): void;
 }

apps/settings/composer/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -20,6 +20,6 @@
     );
 }
 
-require_once __DIR__ . '/composer/autoload_real.php';
+require_once __DIR__.'/composer/autoload_real.php';
 
 return ComposerAutoloaderInitSettings::getLoader();

lib/public/User/Backend/ICountMappedUsersBackend.php

Indentation +6 added lines, -6 removed lines

@@ -30,10 +30,10 @@
  * @since 24.0.7
  */
 interface ICountMappedUsersBackend {
-	/**
-	 * @since 24.0.7
-	 *
-	 * @return int The number of users already mapped to a Nextcloud account
-	 */
-	public function countMappedUsers(): int;
+    /**
+     * @since 24.0.7
+     *
+     * @return int The number of users already mapped to a Nextcloud account
+     */
+    public function countMappedUsers(): int;
 }

lib/private/Net/IpAddressClassifier.php

Spacing +2 added lines, -2 removed lines

@@ -62,9 +62,9 @@
 		}
 		/* Replace by normalized form */
 		if ($parsedIp instanceof IPv6) {
-			$ip = (string)($parsedIp->toIPv4() ?? $parsedIp);
+			$ip = (string) ($parsedIp->toIPv4() ?? $parsedIp);
 		} else {
-			$ip = (string)$parsedIp;
+			$ip = (string) $parsedIp;
 		}
 
 		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {

Indentation +37 added lines, -37 removed lines

@@ -21,41 +21,41 @@
  * @internal
  */
 class IpAddressClassifier {
-	private const LOCAL_ADDRESS_RANGES = [
-		'100.64.0.0/10', // See RFC 6598
-		'192.0.0.0/24', // See RFC 6890
-	];
-
-	/**
-	 * Check host identifier for local IPv4 and IPv6 address ranges
-	 *
-	 * Hostnames are not considered local. Use the HostnameClassifier for those.
-	 */
-	public function isLocalAddress(string $ip): bool {
-		$parsedIp = Factory::parseAddressString(
-			$ip,
-			ParseStringFlag::IPV4_MAYBE_NON_DECIMAL | ParseStringFlag::IPV4ADDRESS_MAYBE_NON_QUAD_DOTTED | ParseStringFlag::MAY_INCLUDE_ZONEID
-		);
-		if ($parsedIp === null) {
-			/* Not an IP */
-			return false;
-		}
-		/* Replace by normalized form */
-		if ($parsedIp instanceof IPv6) {
-			$ip = (string)($parsedIp->toIPv4() ?? $parsedIp);
-		} else {
-			$ip = (string)$parsedIp;
-		}
-
-		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
-			/* Range address */
-			return true;
-		}
-		if (IpUtils::checkIp($ip, self::LOCAL_ADDRESS_RANGES)) {
-			/* Within local range */
-			return true;
-		}
-
-		return false;
-	}
+    private const LOCAL_ADDRESS_RANGES = [
+        '100.64.0.0/10', // See RFC 6598
+        '192.0.0.0/24', // See RFC 6890
+    ];
+
+    /**
+     * Check host identifier for local IPv4 and IPv6 address ranges
+     *
+     * Hostnames are not considered local. Use the HostnameClassifier for those.
+     */
+    public function isLocalAddress(string $ip): bool {
+        $parsedIp = Factory::parseAddressString(
+            $ip,
+            ParseStringFlag::IPV4_MAYBE_NON_DECIMAL | ParseStringFlag::IPV4ADDRESS_MAYBE_NON_QUAD_DOTTED | ParseStringFlag::MAY_INCLUDE_ZONEID
+        );
+        if ($parsedIp === null) {
+            /* Not an IP */
+            return false;
+        }
+        /* Replace by normalized form */
+        if ($parsedIp instanceof IPv6) {
+            $ip = (string)($parsedIp->toIPv4() ?? $parsedIp);
+        } else {
+            $ip = (string)$parsedIp;
+        }
+
+        if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+            /* Range address */
+            return true;
+        }
+        if (IpUtils::checkIp($ip, self::LOCAL_ADDRESS_RANGES)) {
+            /* Within local range */
+            return true;
+        }
+
+        return false;
+    }
 }

lib/private/Log/ErrorHandler.php

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
 	public function onShutdown(): void {
 		$error = error_get_last();
 		if ($error) {
-			$msg = $error['message'] . ' at ' . $error['file'] . '#' . $error['line'];
+			$msg = $error['message'].' at '.$error['file'].'#'.$error['line'];
 			$this->logger->critical(self::removePassword($msg), ['app' => 'PHP']);
 		}
 	}
@@ -66,7 +66,7 @@ 
 	public function onException(Throwable $exception): void {
 		$class = get_class($exception);
 		$msg = $exception->getMessage();
-		$msg = "$class: $msg at " . $exception->getFile() . '#' . $exception->getLine();
+		$msg = "$class: $msg at ".$exception->getFile().'#'.$exception->getLine();
 		$this->logger->critical(self::removePassword($msg), ['app' => 'PHP']);
 	}
 
@@ -77,7 +77,7 @@ 
 		if (!(error_reporting() & $number)) {
 			return true;
 		}
-		$msg = $message . ' at ' . $file . '#' . $line;
+		$msg = $message.' at '.$file.'#'.$line;
 		$e = new Error(self::removePassword($msg));
 		$this->logger->log(self::errnoToLogLevel($number), $e->getMessage(), ['app' => 'PHP']);
 		return true;
@@ -87,7 +87,7 @@ 
 	 * Recoverable handler which catch all errors, warnings and notices
 	 */
 	public function onAll(int $number, string $message, string $file, int $line): bool {
-		$msg = $message . ' at ' . $file . '#' . $line;
+		$msg = $message.' at '.$file.'#'.$line;
 		$e = new Error(self::removePassword($msg));
 		$this->logger->log(self::errnoToLogLevel($number), $e->getMessage(), ['app' => 'PHP']);
 		return true;

Indentation +58 added lines, -58 removed lines

@@ -14,68 +14,68 @@
 use Throwable;
 
 class ErrorHandler {
-	public function __construct(
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	/**
-	 * Remove password in URLs
-	 */
-	private static function removePassword(string $msg): string {
-		return preg_replace('#//(.*):(.*)@#', '//xxx:xxx@', $msg);
-	}
+    /**
+     * Remove password in URLs
+     */
+    private static function removePassword(string $msg): string {
+        return preg_replace('#//(.*):(.*)@#', '//xxx:xxx@', $msg);
+    }
 
-	/**
-	 * Fatal errors handler
-	 */
-	public function onShutdown(): void {
-		$error = error_get_last();
-		if ($error) {
-			$msg = $error['message'] . ' at ' . $error['file'] . '#' . $error['line'];
-			$this->logger->critical(self::removePassword($msg), ['app' => 'PHP']);
-		}
-	}
+    /**
+     * Fatal errors handler
+     */
+    public function onShutdown(): void {
+        $error = error_get_last();
+        if ($error) {
+            $msg = $error['message'] . ' at ' . $error['file'] . '#' . $error['line'];
+            $this->logger->critical(self::removePassword($msg), ['app' => 'PHP']);
+        }
+    }
 
-	/**
-	 * Uncaught exception handler
-	 */
-	public function onException(Throwable $exception): void {
-		$class = get_class($exception);
-		$msg = $exception->getMessage();
-		$msg = "$class: $msg at " . $exception->getFile() . '#' . $exception->getLine();
-		$this->logger->critical(self::removePassword($msg), ['app' => 'PHP']);
-	}
+    /**
+     * Uncaught exception handler
+     */
+    public function onException(Throwable $exception): void {
+        $class = get_class($exception);
+        $msg = $exception->getMessage();
+        $msg = "$class: $msg at " . $exception->getFile() . '#' . $exception->getLine();
+        $this->logger->critical(self::removePassword($msg), ['app' => 'PHP']);
+    }
 
-	/**
-	 * Recoverable errors handler
-	 */
-	public function onError(int $number, string $message, string $file, int $line): bool {
-		if (!(error_reporting() & $number)) {
-			return true;
-		}
-		$msg = $message . ' at ' . $file . '#' . $line;
-		$e = new Error(self::removePassword($msg));
-		$this->logger->log(self::errnoToLogLevel($number), $e->getMessage(), ['app' => 'PHP']);
-		return true;
-	}
+    /**
+     * Recoverable errors handler
+     */
+    public function onError(int $number, string $message, string $file, int $line): bool {
+        if (!(error_reporting() & $number)) {
+            return true;
+        }
+        $msg = $message . ' at ' . $file . '#' . $line;
+        $e = new Error(self::removePassword($msg));
+        $this->logger->log(self::errnoToLogLevel($number), $e->getMessage(), ['app' => 'PHP']);
+        return true;
+    }
 
-	/**
-	 * Recoverable handler which catch all errors, warnings and notices
-	 */
-	public function onAll(int $number, string $message, string $file, int $line): bool {
-		$msg = $message . ' at ' . $file . '#' . $line;
-		$e = new Error(self::removePassword($msg));
-		$this->logger->log(self::errnoToLogLevel($number), $e->getMessage(), ['app' => 'PHP']);
-		return true;
-	}
+    /**
+     * Recoverable handler which catch all errors, warnings and notices
+     */
+    public function onAll(int $number, string $message, string $file, int $line): bool {
+        $msg = $message . ' at ' . $file . '#' . $line;
+        $e = new Error(self::removePassword($msg));
+        $this->logger->log(self::errnoToLogLevel($number), $e->getMessage(), ['app' => 'PHP']);
+        return true;
+    }
 
-	private static function errnoToLogLevel(int $errno): int {
-		return match ($errno) {
-			E_USER_WARNING => ILogger::WARN,
-			E_DEPRECATED, E_USER_DEPRECATED => ILogger::DEBUG,
-			E_USER_NOTICE => ILogger::INFO,
-			default => ILogger::ERROR,
-		};
-	}
+    private static function errnoToLogLevel(int $errno): int {
+        return match ($errno) {
+            E_USER_WARNING => ILogger::WARN,
+            E_DEPRECATED, E_USER_DEPRECATED => ILogger::DEBUG,
+            E_USER_NOTICE => ILogger::INFO,
+            default => ILogger::ERROR,
+        };
+    }
 }

lib/private/Support/Subscription/Assertion.php

Indentation +17 added lines, -17 removed lines

@@ -33,23 +33,23 @@
 use OCP\Support\Subscription\IRegistry;
 
 class Assertion implements IAssertion {
-	private IRegistry $registry;
-	private IFactory $l10nFactory;
-	private IManager $notificationManager;
+    private IRegistry $registry;
+    private IFactory $l10nFactory;
+    private IManager $notificationManager;
 
-	public function __construct(IRegistry $registry, IFactory $l10nFactory, IManager $notificationManager) {
-		$this->registry = $registry;
-		$this->l10nFactory = $l10nFactory;
-		$this->notificationManager = $notificationManager;
-	}
+    public function __construct(IRegistry $registry, IFactory $l10nFactory, IManager $notificationManager) {
+        $this->registry = $registry;
+        $this->l10nFactory = $l10nFactory;
+        $this->notificationManager = $notificationManager;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function createUserIsLegit(): void {
-		if ($this->registry->delegateIsHardUserLimitReached($this->notificationManager)) {
-			$l = $this->l10nFactory->get('lib');
-			throw new HintException($l->t('The user was not created because the user limit has been reached. Check your notifications to learn more.'));
-		}
-	}
+    /**
+     * @inheritDoc
+     */
+    public function createUserIsLegit(): void {
+        if ($this->registry->delegateIsHardUserLimitReached($this->notificationManager)) {
+            $l = $this->l10nFactory->get('lib');
+            throw new HintException($l->t('The user was not created because the user limit has been reached. Check your notifications to learn more.'));
+        }
+    }
 }