nextcloud / server

apps/user_ldap/lib/Migration/Version1130Date20220110154719.php

Indentation +21 added lines, -21 removed lines

@@ -32,25 +32,25 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1130Date20220110154719 extends SimpleMigrationStep {
-	public function getName() {
-		return 'Drop ldap_group_mapping_backup';
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		if ($schema->hasTable('ldap_group_mapping_backup')) {
-			$schema->dropTable('ldap_group_mapping_backup');
-			return $schema;
-		}
-
-		return null;
-	}
+    public function getName() {
+        return 'Drop ldap_group_mapping_backup';
+    }
+
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        if ($schema->hasTable('ldap_group_mapping_backup')) {
+            $schema->dropTable('ldap_group_mapping_backup');
+            return $schema;
+        }
+
+        return null;
+    }
 }

apps/testing/lib/Controller/LockingController.php

Spacing +9 added lines, -9 removed lines

@@ -94,7 +94,7 @@ 
 	 */
 	protected function getPath(string $user, string $path): string {
 		$node = $this->rootFolder->getUserFolder($user)->get($path);
-		return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
+		return 'files/'.md5($node->getStorage()->getId().'::'.trim($node->getInternalPath(), '/'));
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 
 		try {
 			$lockingProvider->acquireLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
+			$this->config->setAppValue('testing', 'locking_'.$path, (string) $type);
 			return new DataResponse();
 		} catch (LockedException $e) {
 			throw new OCSException('', Http::STATUS_LOCKED, $e);
@@ -148,7 +148,7 @@ 
 
 		try {
 			$lockingProvider->changeLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
+			$this->config->setAppValue('testing', 'locking_'.$path, (string) $type);
 			return new DataResponse();
 		} catch (LockedException $e) {
 			throw new OCSException('', Http::STATUS_LOCKED, $e);
@@ -171,7 +171,7 @@ 
 
 		try {
 			$lockingProvider->releaseLock($path, $type);
-			$this->config->deleteAppValue('testing', 'locking_' . $path);
+			$this->config->deleteAppValue('testing', 'locking_'.$path);
 			return new DataResponse();
 		} catch (LockedException $e) {
 			throw new OCSException('', Http::STATUS_LOCKED, $e);
@@ -206,12 +206,12 @@ 
 			if (strpos($lock, 'locking_') === 0) {
 				$path = substr($lock, strlen('locking_'));
 
-				if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
-				} elseif ($type === ILockingProvider::LOCK_SHARED && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
+				if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int) $this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
+					$lockingProvider->releaseLock($path, (int) $this->config->getAppValue('testing', $lock));
+				} elseif ($type === ILockingProvider::LOCK_SHARED && (int) $this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
+					$lockingProvider->releaseLock($path, (int) $this->config->getAppValue('testing', $lock));
 				} else {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
+					$lockingProvider->releaseLock($path, (int) $this->config->getAppValue('testing', $lock));
 				}
 			}
 		}

Indentation +160 added lines, -160 removed lines

@@ -23,164 +23,164 @@
 
 class LockingController extends OCSController {
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param ILockingProvider $lockingProvider
-	 * @param FakeDBLockingProvider $fakeDBLockingProvider
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 * @param IRootFolder $rootFolder
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		protected ILockingProvider $lockingProvider,
-		protected FakeDBLockingProvider $fakeDBLockingProvider,
-		protected IDBConnection $connection,
-		protected IConfig $config,
-		protected IRootFolder $rootFolder,
-	) {
-		parent::__construct($appName, $request);
-	}
-
-	/**
-	 * @throws \RuntimeException
-	 */
-	protected function getLockingProvider(): ILockingProvider {
-		if ($this->lockingProvider instanceof DBLockingProvider) {
-			return $this->fakeDBLockingProvider;
-		}
-		throw new \RuntimeException('Lock provisioning is only possible using the DBLockingProvider');
-	}
-
-	/**
-	 * @throws NotFoundException
-	 */
-	protected function getPath(string $user, string $path): string {
-		$node = $this->rootFolder->getUserFolder($user)->get($path);
-		return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
-	}
-
-	/**
-	 * @throws OCSException
-	 */
-	public function isLockingEnabled(): DataResponse {
-		try {
-			$this->getLockingProvider();
-			return new DataResponse();
-		} catch (\RuntimeException $e) {
-			throw new OCSException($e->getMessage(), Http::STATUS_NOT_IMPLEMENTED, $e);
-		}
-	}
-
-	/**
-	 * @throws OCSException
-	 */
-	public function acquireLock(int $type, string $user, string $path): DataResponse {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->acquireLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
-			return new DataResponse();
-		} catch (LockedException $e) {
-			throw new OCSException('', Http::STATUS_LOCKED, $e);
-		}
-	}
-
-	/**
-	 * @throws OCSException
-	 */
-	public function changeLock(int $type, string $user, string $path): DataResponse {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->changeLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
-			return new DataResponse();
-		} catch (LockedException $e) {
-			throw new OCSException('', Http::STATUS_LOCKED, $e);
-		}
-	}
-
-	/**
-	 * @throws OCSException
-	 */
-	public function releaseLock(int $type, string $user, string $path): DataResponse {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->releaseLock($path, $type);
-			$this->config->deleteAppValue('testing', 'locking_' . $path);
-			return new DataResponse();
-		} catch (LockedException $e) {
-			throw new OCSException('', Http::STATUS_LOCKED, $e);
-		}
-	}
-
-	/**
-	 * @throws OCSException
-	 */
-	public function isLocked(int $type, string $user, string $path): DataResponse {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		if ($lockingProvider->isLocked($path, $type)) {
-			return new DataResponse();
-		}
-
-		throw new OCSException('', Http::STATUS_LOCKED);
-	}
-
-	public function releaseAll(?int $type = null): DataResponse {
-		$lockingProvider = $this->getLockingProvider();
-
-		foreach ($this->config->getAppKeys('testing') as $lock) {
-			if (strpos($lock, 'locking_') === 0) {
-				$path = substr($lock, strlen('locking_'));
-
-				if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
-				} elseif ($type === ILockingProvider::LOCK_SHARED && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
-				} else {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
-				}
-			}
-		}
-
-		return new DataResponse();
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param ILockingProvider $lockingProvider
+     * @param FakeDBLockingProvider $fakeDBLockingProvider
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     * @param IRootFolder $rootFolder
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        protected ILockingProvider $lockingProvider,
+        protected FakeDBLockingProvider $fakeDBLockingProvider,
+        protected IDBConnection $connection,
+        protected IConfig $config,
+        protected IRootFolder $rootFolder,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+    /**
+     * @throws \RuntimeException
+     */
+    protected function getLockingProvider(): ILockingProvider {
+        if ($this->lockingProvider instanceof DBLockingProvider) {
+            return $this->fakeDBLockingProvider;
+        }
+        throw new \RuntimeException('Lock provisioning is only possible using the DBLockingProvider');
+    }
+
+    /**
+     * @throws NotFoundException
+     */
+    protected function getPath(string $user, string $path): string {
+        $node = $this->rootFolder->getUserFolder($user)->get($path);
+        return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
+    }
+
+    /**
+     * @throws OCSException
+     */
+    public function isLockingEnabled(): DataResponse {
+        try {
+            $this->getLockingProvider();
+            return new DataResponse();
+        } catch (\RuntimeException $e) {
+            throw new OCSException($e->getMessage(), Http::STATUS_NOT_IMPLEMENTED, $e);
+        }
+    }
+
+    /**
+     * @throws OCSException
+     */
+    public function acquireLock(int $type, string $user, string $path): DataResponse {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->acquireLock($path, $type);
+            $this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
+            return new DataResponse();
+        } catch (LockedException $e) {
+            throw new OCSException('', Http::STATUS_LOCKED, $e);
+        }
+    }
+
+    /**
+     * @throws OCSException
+     */
+    public function changeLock(int $type, string $user, string $path): DataResponse {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->changeLock($path, $type);
+            $this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
+            return new DataResponse();
+        } catch (LockedException $e) {
+            throw new OCSException('', Http::STATUS_LOCKED, $e);
+        }
+    }
+
+    /**
+     * @throws OCSException
+     */
+    public function releaseLock(int $type, string $user, string $path): DataResponse {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->releaseLock($path, $type);
+            $this->config->deleteAppValue('testing', 'locking_' . $path);
+            return new DataResponse();
+        } catch (LockedException $e) {
+            throw new OCSException('', Http::STATUS_LOCKED, $e);
+        }
+    }
+
+    /**
+     * @throws OCSException
+     */
+    public function isLocked(int $type, string $user, string $path): DataResponse {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        if ($lockingProvider->isLocked($path, $type)) {
+            return new DataResponse();
+        }
+
+        throw new OCSException('', Http::STATUS_LOCKED);
+    }
+
+    public function releaseAll(?int $type = null): DataResponse {
+        $lockingProvider = $this->getLockingProvider();
+
+        foreach ($this->config->getAppKeys('testing') as $lock) {
+            if (strpos($lock, 'locking_') === 0) {
+                $path = substr($lock, strlen('locking_'));
+
+                if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
+                    $lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
+                } elseif ($type === ILockingProvider::LOCK_SHARED && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
+                    $lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
+                } else {
+                    $lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
+                }
+            }
+        }
+
+        return new DataResponse();
+    }
 }

core/Migrations/Version24000Date20211213081604.php

Indentation +30 added lines, -30 removed lines

@@ -30,37 +30,37 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version24000Date20211213081604 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$hasTable = $schema->hasTable('ratelimit_entries');
+        $hasTable = $schema->hasTable('ratelimit_entries');
 
-		if (!$hasTable) {
-			$table = $schema->createTable('ratelimit_entries');
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-			]);
-			$table->addColumn('hash', Types::STRING, [
-				'notnull' => true,
-				'length' => 128,
-			]);
-			$table->addColumn('delete_after', Types::DATETIME, [
-				'notnull' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['hash'], 'ratelimit_hash');
-			$table->addIndex(['delete_after'], 'ratelimit_delete_after');
-			return $schema;
-		}
+        if (!$hasTable) {
+            $table = $schema->createTable('ratelimit_entries');
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+            ]);
+            $table->addColumn('hash', Types::STRING, [
+                'notnull' => true,
+                'length' => 128,
+            ]);
+            $table->addColumn('delete_after', Types::DATETIME, [
+                'notnull' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['hash'], 'ratelimit_hash');
+            $table->addIndex(['delete_after'], 'ratelimit_delete_after');
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

core/Migrations/Version24000Date20211213081506.php

Indentation +16 added lines, -16 removed lines

@@ -29,22 +29,22 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version24000Date20211213081506 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$hasTable = $schema->hasTable('ratelimit_entries');
-		if ($hasTable) {
-			$schema->dropTable('ratelimit_entries');
-			return $schema;
-		}
+        $hasTable = $schema->hasTable('ratelimit_entries');
+        if ($hasTable) {
+            $schema->dropTable('ratelimit_entries');
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

lib/private/Talk/ConversationOptions.php

Indentation +14 added lines, -14 removed lines

@@ -28,22 +28,22 @@
 use OCP\Talk\IConversationOptions;
 
 class ConversationOptions implements IConversationOptions {
-	private bool $isPublic;
+    private bool $isPublic;
 
-	private function __construct(bool $isPublic) {
-		$this->isPublic = $isPublic;
-	}
+    private function __construct(bool $isPublic) {
+        $this->isPublic = $isPublic;
+    }
 
-	public static function default(): self {
-		return new self(false);
-	}
+    public static function default(): self {
+        return new self(false);
+    }
 
-	public function setPublic(bool $isPublic = true): IConversationOptions {
-		$this->isPublic = $isPublic;
-		return $this;
-	}
+    public function setPublic(bool $isPublic = true): IConversationOptions {
+        $this->isPublic = $isPublic;
+        return $this;
+    }
 
-	public function isPublic(): bool {
-		return $this->isPublic;
-	}
+    public function isPublic(): bool {
+        return $this->isPublic;
+    }
 }

core/Migrations/Version24000Date20220131153041.php

Indentation +19 added lines, -19 removed lines

@@ -32,24 +32,24 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version24000Date20220131153041 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('jobs');
-		if (!$table->hasColumn('time_sensitive')) {
-			$table->addColumn('time_sensitive', Types::SMALLINT, [
-				'default' => 1,
-			]);
-			$table->addIndex(['time_sensitive'], 'jobs_time_sensitive');
-			return $schema;
-		}
-		return null;
-	}
+        $table = $schema->getTable('jobs');
+        if (!$table->hasColumn('time_sensitive')) {
+            $table->addColumn('time_sensitive', Types::SMALLINT, [
+                'default' => 1,
+            ]);
+            $table->addIndex(['time_sensitive'], 'jobs_time_sensitive');
+            return $schema;
+        }
+        return null;
+    }
 }

apps/user_ldap/lib/Migration/Version1130Date20211102154716.php

Spacing +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
 
 		while ($nextcloudId = array_shift($idList)) {
 			$update->setParameter('nextcloudId', $nextcloudId);
-			$update->setParameter('invalidatedUuid', 'invalidated_' . \bin2hex(\random_bytes(6)));
+			$update->setParameter('invalidatedUuid', 'invalidated_'.\bin2hex(\random_bytes(6)));
 			try {
 				$update->executeStatement();
 				$this->logger->warning(

Indentation +219 added lines, -219 removed lines

@@ -22,245 +22,245 @@
 
 class Version1130Date20211102154716 extends SimpleMigrationStep {
 
-	/** @var string[] */
-	private $hashColumnAddedToTables = [];
+    /** @var string[] */
+    private $hashColumnAddedToTables = [];
 
-	public function __construct(
-		private IDBConnection $dbc,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IDBConnection $dbc,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function getName() {
-		return 'Adjust LDAP user and group ldap_dn column lengths and add ldap_dn_hash columns';
-	}
+    public function getName() {
+        return 'Adjust LDAP user and group ldap_dn column lengths and add ldap_dn_hash columns';
+    }
 
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
-			$this->processDuplicateUUIDs($tableName);
-		}
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
+            $this->processDuplicateUUIDs($tableName);
+        }
 
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		if ($schema->hasTable('ldap_group_mapping_backup')) {
-			// Previous upgrades of a broken release might have left an incomplete
-			// ldap_group_mapping_backup table. No need to recreate, but it
-			// should be empty.
-			// TRUNCATE is not available from Query Builder, but faster than DELETE FROM.
-			$sql = $this->dbc->getDatabasePlatform()->getTruncateTableSQL('`*PREFIX*ldap_group_mapping_backup`', false);
-			$this->dbc->executeStatement($sql);
-		}
-	}
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        if ($schema->hasTable('ldap_group_mapping_backup')) {
+            // Previous upgrades of a broken release might have left an incomplete
+            // ldap_group_mapping_backup table. No need to recreate, but it
+            // should be empty.
+            // TRUNCATE is not available from Query Builder, but faster than DELETE FROM.
+            $sql = $this->dbc->getDatabasePlatform()->getTruncateTableSQL('`*PREFIX*ldap_group_mapping_backup`', false);
+            $this->dbc->executeStatement($sql);
+        }
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$changeSchema = false;
-		foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
-			$table = $schema->getTable($tableName);
-			if (!$table->hasColumn('ldap_dn_hash')) {
-				$table->addColumn('ldap_dn_hash', Types::STRING, [
-					'notnull' => false,
-					'length' => 64,
-				]);
-				$changeSchema = true;
-				$this->hashColumnAddedToTables[] = $tableName;
-			}
-			$column = $table->getColumn('ldap_dn');
-			if ($tableName === 'ldap_user_mapping') {
-				if ($column->getLength() < 4000) {
-					$column->setLength(4000);
-					$changeSchema = true;
-				}
+        $changeSchema = false;
+        foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
+            $table = $schema->getTable($tableName);
+            if (!$table->hasColumn('ldap_dn_hash')) {
+                $table->addColumn('ldap_dn_hash', Types::STRING, [
+                    'notnull' => false,
+                    'length' => 64,
+                ]);
+                $changeSchema = true;
+                $this->hashColumnAddedToTables[] = $tableName;
+            }
+            $column = $table->getColumn('ldap_dn');
+            if ($tableName === 'ldap_user_mapping') {
+                if ($column->getLength() < 4000) {
+                    $column->setLength(4000);
+                    $changeSchema = true;
+                }
 
-				if ($table->hasIndex('ldap_dn_users')) {
-					$table->dropIndex('ldap_dn_users');
-					$changeSchema = true;
-				}
-				if (!$table->hasIndex('ldap_user_dn_hashes')) {
-					$table->addUniqueIndex(['ldap_dn_hash'], 'ldap_user_dn_hashes');
-					$changeSchema = true;
-				}
-				if (!$table->hasIndex('ldap_user_directory_uuid')) {
-					$table->addUniqueIndex(['directory_uuid'], 'ldap_user_directory_uuid');
-					$changeSchema = true;
-				}
-			} elseif (!$schema->hasTable('ldap_group_mapping_backup')) {
-				// We need to copy the table twice to be able to change primary key, prepare the backup table
-				$table2 = $schema->createTable('ldap_group_mapping_backup');
-				$table2->addColumn('ldap_dn', Types::STRING, [
-					'notnull' => true,
-					'length' => 4000,
-					'default' => '',
-				]);
-				$table2->addColumn('owncloud_name', Types::STRING, [
-					'notnull' => true,
-					'length' => 64,
-					'default' => '',
-				]);
-				$table2->addColumn('directory_uuid', Types::STRING, [
-					'notnull' => true,
-					'length' => 255,
-					'default' => '',
-				]);
-				$table2->addColumn('ldap_dn_hash', Types::STRING, [
-					'notnull' => false,
-					'length' => 64,
-				]);
-				$table2->setPrimaryKey(['owncloud_name'], 'lgm_backup_primary');
-				$changeSchema = true;
-			}
-		}
+                if ($table->hasIndex('ldap_dn_users')) {
+                    $table->dropIndex('ldap_dn_users');
+                    $changeSchema = true;
+                }
+                if (!$table->hasIndex('ldap_user_dn_hashes')) {
+                    $table->addUniqueIndex(['ldap_dn_hash'], 'ldap_user_dn_hashes');
+                    $changeSchema = true;
+                }
+                if (!$table->hasIndex('ldap_user_directory_uuid')) {
+                    $table->addUniqueIndex(['directory_uuid'], 'ldap_user_directory_uuid');
+                    $changeSchema = true;
+                }
+            } elseif (!$schema->hasTable('ldap_group_mapping_backup')) {
+                // We need to copy the table twice to be able to change primary key, prepare the backup table
+                $table2 = $schema->createTable('ldap_group_mapping_backup');
+                $table2->addColumn('ldap_dn', Types::STRING, [
+                    'notnull' => true,
+                    'length' => 4000,
+                    'default' => '',
+                ]);
+                $table2->addColumn('owncloud_name', Types::STRING, [
+                    'notnull' => true,
+                    'length' => 64,
+                    'default' => '',
+                ]);
+                $table2->addColumn('directory_uuid', Types::STRING, [
+                    'notnull' => true,
+                    'length' => 255,
+                    'default' => '',
+                ]);
+                $table2->addColumn('ldap_dn_hash', Types::STRING, [
+                    'notnull' => false,
+                    'length' => 64,
+                ]);
+                $table2->setPrimaryKey(['owncloud_name'], 'lgm_backup_primary');
+                $changeSchema = true;
+            }
+        }
 
-		return $changeSchema ? $schema : null;
-	}
+        return $changeSchema ? $schema : null;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 */
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
-		$this->handleDNHashes('ldap_group_mapping');
-		$this->handleDNHashes('ldap_user_mapping');
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     */
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+        $this->handleDNHashes('ldap_group_mapping');
+        $this->handleDNHashes('ldap_user_mapping');
+    }
 
-	protected function handleDNHashes(string $table): void {
-		$select = $this->getSelectQuery($table);
-		$update = $this->getUpdateQuery($table);
+    protected function handleDNHashes(string $table): void {
+        $select = $this->getSelectQuery($table);
+        $update = $this->getUpdateQuery($table);
 
-		$result = $select->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			$dnHash = hash('sha256', $row['ldap_dn'], false);
-			$update->setParameter('name', $row['owncloud_name']);
-			$update->setParameter('dn_hash', $dnHash);
-			try {
-				$update->executeStatement();
-			} catch (Exception $e) {
-				$this->logger->error('Failed to add hash "{dnHash}" ("{name}" of {table})',
-					[
-						'app' => 'user_ldap',
-						'name' => $row['owncloud_name'],
-						'dnHash' => $dnHash,
-						'table' => $table,
-						'exception' => $e,
-					]
-				);
-			}
-		}
-		$result->closeCursor();
-	}
+        $result = $select->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            $dnHash = hash('sha256', $row['ldap_dn'], false);
+            $update->setParameter('name', $row['owncloud_name']);
+            $update->setParameter('dn_hash', $dnHash);
+            try {
+                $update->executeStatement();
+            } catch (Exception $e) {
+                $this->logger->error('Failed to add hash "{dnHash}" ("{name}" of {table})',
+                    [
+                        'app' => 'user_ldap',
+                        'name' => $row['owncloud_name'],
+                        'dnHash' => $dnHash,
+                        'table' => $table,
+                        'exception' => $e,
+                    ]
+                );
+            }
+        }
+        $result->closeCursor();
+    }
 
-	protected function getSelectQuery(string $table): IQueryBuilder {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->select('owncloud_name', 'ldap_dn')
-			->from($table);
+    protected function getSelectQuery(string $table): IQueryBuilder {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->select('owncloud_name', 'ldap_dn')
+            ->from($table);
 
-		// when added we may run into risk that it's read from a DB node
-		// where the column is not present. Then the where clause is also
-		// not necessary since all rows qualify.
-		if (!in_array($table, $this->hashColumnAddedToTables, true)) {
-			$qb->where($qb->expr()->isNull('ldap_dn_hash'));
-		}
+        // when added we may run into risk that it's read from a DB node
+        // where the column is not present. Then the where clause is also
+        // not necessary since all rows qualify.
+        if (!in_array($table, $this->hashColumnAddedToTables, true)) {
+            $qb->where($qb->expr()->isNull('ldap_dn_hash'));
+        }
 
-		return $qb;
-	}
+        return $qb;
+    }
 
-	protected function getUpdateQuery(string $table): IQueryBuilder {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->update($table)
-			->set('ldap_dn_hash', $qb->createParameter('dn_hash'))
-			->where($qb->expr()->eq('owncloud_name', $qb->createParameter('name')));
-		return $qb;
-	}
+    protected function getUpdateQuery(string $table): IQueryBuilder {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->update($table)
+            ->set('ldap_dn_hash', $qb->createParameter('dn_hash'))
+            ->where($qb->expr()->eq('owncloud_name', $qb->createParameter('name')));
+        return $qb;
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	protected function processDuplicateUUIDs(string $table): void {
-		$uuids = $this->getDuplicatedUuids($table);
-		$idsWithUuidToInvalidate = [];
-		foreach ($uuids as $uuid) {
-			array_push($idsWithUuidToInvalidate, ...$this->getNextcloudIdsByUuid($table, $uuid));
-		}
-		$this->invalidateUuids($table, $idsWithUuidToInvalidate);
-	}
+    /**
+     * @throws Exception
+     */
+    protected function processDuplicateUUIDs(string $table): void {
+        $uuids = $this->getDuplicatedUuids($table);
+        $idsWithUuidToInvalidate = [];
+        foreach ($uuids as $uuid) {
+            array_push($idsWithUuidToInvalidate, ...$this->getNextcloudIdsByUuid($table, $uuid));
+        }
+        $this->invalidateUuids($table, $idsWithUuidToInvalidate);
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	protected function invalidateUuids(string $table, array $idList): void {
-		$update = $this->dbc->getQueryBuilder();
-		$update->update($table)
-			->set('directory_uuid', $update->createParameter('invalidatedUuid'))
-			->where($update->expr()->eq('owncloud_name', $update->createParameter('nextcloudId')));
+    /**
+     * @throws Exception
+     */
+    protected function invalidateUuids(string $table, array $idList): void {
+        $update = $this->dbc->getQueryBuilder();
+        $update->update($table)
+            ->set('directory_uuid', $update->createParameter('invalidatedUuid'))
+            ->where($update->expr()->eq('owncloud_name', $update->createParameter('nextcloudId')));
 
-		while ($nextcloudId = array_shift($idList)) {
-			$update->setParameter('nextcloudId', $nextcloudId);
-			$update->setParameter('invalidatedUuid', 'invalidated_' . \bin2hex(\random_bytes(6)));
-			try {
-				$update->executeStatement();
-				$this->logger->warning(
-					'LDAP user or group with ID {nid} has a duplicated UUID value which therefore was invalidated. You may double-check your LDAP configuration and trigger an update of the UUID.',
-					[
-						'app' => 'user_ldap',
-						'nid' => $nextcloudId,
-					]
-				);
-			} catch (Exception $e) {
-				// Catch possible, but unlikely duplications if new invalidated errors.
-				// There is the theoretical chance of an infinity loop is, when
-				// the constraint violation has a different background. I cannot
-				// think of one at the moment.
-				if ($e->getReason() !== Exception::REASON_CONSTRAINT_VIOLATION) {
-					throw $e;
-				}
-				$idList[] = $nextcloudId;
-			}
-		}
-	}
+        while ($nextcloudId = array_shift($idList)) {
+            $update->setParameter('nextcloudId', $nextcloudId);
+            $update->setParameter('invalidatedUuid', 'invalidated_' . \bin2hex(\random_bytes(6)));
+            try {
+                $update->executeStatement();
+                $this->logger->warning(
+                    'LDAP user or group with ID {nid} has a duplicated UUID value which therefore was invalidated. You may double-check your LDAP configuration and trigger an update of the UUID.',
+                    [
+                        'app' => 'user_ldap',
+                        'nid' => $nextcloudId,
+                    ]
+                );
+            } catch (Exception $e) {
+                // Catch possible, but unlikely duplications if new invalidated errors.
+                // There is the theoretical chance of an infinity loop is, when
+                // the constraint violation has a different background. I cannot
+                // think of one at the moment.
+                if ($e->getReason() !== Exception::REASON_CONSTRAINT_VIOLATION) {
+                    throw $e;
+                }
+                $idList[] = $nextcloudId;
+            }
+        }
+    }
 
-	/**
-	 * @throws \OCP\DB\Exception
-	 * @return array<string>
-	 */
-	protected function getNextcloudIdsByUuid(string $table, string $uuid): array {
-		$select = $this->dbc->getQueryBuilder();
-		$select->select('owncloud_name')
-			->from($table)
-			->where($select->expr()->eq('directory_uuid', $select->createNamedParameter($uuid)));
+    /**
+     * @throws \OCP\DB\Exception
+     * @return array<string>
+     */
+    protected function getNextcloudIdsByUuid(string $table, string $uuid): array {
+        $select = $this->dbc->getQueryBuilder();
+        $select->select('owncloud_name')
+            ->from($table)
+            ->where($select->expr()->eq('directory_uuid', $select->createNamedParameter($uuid)));
 
-		$result = $select->executeQuery();
-		$idList = [];
-		while (($id = $result->fetchOne()) !== false) {
-			$idList[] = $id;
-		}
-		$result->closeCursor();
-		return $idList;
-	}
+        $result = $select->executeQuery();
+        $idList = [];
+        while (($id = $result->fetchOne()) !== false) {
+            $idList[] = $id;
+        }
+        $result->closeCursor();
+        return $idList;
+    }
 
-	/**
-	 * @return Generator<string>
-	 * @throws \OCP\DB\Exception
-	 */
-	protected function getDuplicatedUuids(string $table): Generator {
-		$select = $this->dbc->getQueryBuilder();
-		$select->select('directory_uuid')
-			->from($table)
-			->groupBy('directory_uuid')
-			->having($select->expr()->gt($select->func()->count('owncloud_name'), $select->createNamedParameter(1)));
+    /**
+     * @return Generator<string>
+     * @throws \OCP\DB\Exception
+     */
+    protected function getDuplicatedUuids(string $table): Generator {
+        $select = $this->dbc->getQueryBuilder();
+        $select->select('directory_uuid')
+            ->from($table)
+            ->groupBy('directory_uuid')
+            ->having($select->expr()->gt($select->func()->count('owncloud_name'), $select->createNamedParameter(1)));
 
-		$result = $select->executeQuery();
-		while (($uuid = $result->fetchOne()) !== false) {
-			yield $uuid;
-		}
-		$result->closeCursor();
-	}
+        $result = $select->executeQuery();
+        while (($uuid = $result->fetchOne()) !== false) {
+            yield $uuid;
+        }
+        $result->closeCursor();
+    }
 }

apps/dav/lib/Connector/Sabre/Exception/BadGateway.php

Indentation +8 added lines, -8 removed lines

@@ -29,12 +29,12 @@
  */
 class BadGateway extends \Sabre\DAV\Exception {
 
-	/**
-	 * Returns the HTTP status code for this exception
-	 *
-	 * @return int
-	 */
-	public function getHTTPCode() {
-		return 502;
-	}
+    /**
+     * Returns the HTTP status code for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        return 502;
+    }
 }

lib/private/Files/Config/CachedMountFileInfo.php

Spacing +1 added lines, -1 removed lines

@@ -53,6 +53,6 @@
 	}
 
 	public function getPath(): string {
-		return $this->getMountPoint() . $this->getInternalPath();
+		return $this->getMountPoint().$this->getInternalPath();
 	}
 }

Indentation +24 added lines, -24 removed lines

@@ -9,31 +9,31 @@
 use OCP\IUser;
 
 class CachedMountFileInfo extends CachedMountInfo implements ICachedMountFileInfo {
-	private string $internalPath;
+    private string $internalPath;
 
-	public function __construct(
-		IUser $user,
-		int $storageId,
-		int $rootId,
-		string $mountPoint,
-		?int $mountId,
-		string $mountProvider,
-		string $rootInternalPath,
-		string $internalPath,
-	) {
-		parent::__construct($user, $storageId, $rootId, $mountPoint, $mountProvider, $mountId, $rootInternalPath);
-		$this->internalPath = $internalPath;
-	}
+    public function __construct(
+        IUser $user,
+        int $storageId,
+        int $rootId,
+        string $mountPoint,
+        ?int $mountId,
+        string $mountProvider,
+        string $rootInternalPath,
+        string $internalPath,
+    ) {
+        parent::__construct($user, $storageId, $rootId, $mountPoint, $mountProvider, $mountId, $rootInternalPath);
+        $this->internalPath = $internalPath;
+    }
 
-	public function getInternalPath(): string {
-		if ($this->getRootInternalPath()) {
-			return substr($this->internalPath, strlen($this->getRootInternalPath()) + 1);
-		} else {
-			return $this->internalPath;
-		}
-	}
+    public function getInternalPath(): string {
+        if ($this->getRootInternalPath()) {
+            return substr($this->internalPath, strlen($this->getRootInternalPath()) + 1);
+        } else {
+            return $this->internalPath;
+        }
+    }
 
-	public function getPath(): string {
-		return $this->getMountPoint() . $this->getInternalPath();
-	}
+    public function getPath(): string {
+        return $this->getMountPoint() . $this->getInternalPath();
+    }
 }