nextcloud / server

apps/oauth2/lib/Migration/Version010402Date20190107124745.php

Indentation +17 added lines, -17 removed lines

@@ -32,22 +32,22 @@
 
 class Version010402Date20190107124745 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) {
-		/** @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) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		// During an ownCloud migration, the client_identifier column identifier might not exist yet.
-		if ($schema->getTable('oauth2_clients')->hasColumn('client_identifier')) {
-			$table = $schema->getTable('oauth2_clients');
-			$table->dropIndex('oauth2_client_id_idx');
-			$table->addUniqueIndex(['client_identifier'], 'oauth2_client_id_idx');
-			return $schema;
-		}
-	}
+        // During an ownCloud migration, the client_identifier column identifier might not exist yet.
+        if ($schema->getTable('oauth2_clients')->hasColumn('client_identifier')) {
+            $table = $schema->getTable('oauth2_clients');
+            $table->dropIndex('oauth2_client_id_idx');
+            $table->addUniqueIndex(['client_identifier'], 'oauth2_client_id_idx');
+            return $schema;
+        }
+    }
 }

lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php

Spacing +18 added lines, -18 removed lines

@@ -47,7 +47,7 @@ 
 	}
 
 	public function md5($input): IQueryFunction {
-		return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
+		return new QueryFunction('MD5('.$this->helper->quoteColumnName($input).')');
 	}
 
 	public function concat($x, ...$expr): IQueryFunction {
@@ -61,64 +61,64 @@ 
 
 	public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
 		$separator = $this->connection->quote($separator);
-		return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ' SEPARATOR ' . $separator . ')');
+		return new QueryFunction('GROUP_CONCAT('.$this->helper->quoteColumnName($expr).' SEPARATOR '.$separator.')');
 	}
 
 	public function substring($input, $start, $length = null): IQueryFunction {
 		if ($length) {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).', '.$this->helper->quoteColumnName($length).')');
 		} else {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).')');
 		}
 	}
 
 	public function sum($field): IQueryFunction {
-		return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('SUM('.$this->helper->quoteColumnName($field).')');
 	}
 
 	public function lower($field): IQueryFunction {
-		return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('LOWER('.$this->helper->quoteColumnName($field).')');
 	}
 
 	public function add($x, $y): IQueryFunction {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' + ' . $this->helper->quoteColumnName($y));
+		return new QueryFunction($this->helper->quoteColumnName($x).' + '.$this->helper->quoteColumnName($y));
 	}
 
 	public function subtract($x, $y): IQueryFunction {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' - ' . $this->helper->quoteColumnName($y));
+		return new QueryFunction($this->helper->quoteColumnName($x).' - '.$this->helper->quoteColumnName($y));
 	}
 
 	public function count($count = '', $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
 		$quotedName = $count === '' ? '*' : $this->helper->quoteColumnName($count);
-		return new QueryFunction('COUNT(' . $quotedName . ')' . $alias);
+		return new QueryFunction('COUNT('.$quotedName.')'.$alias);
 	}
 
 	public function octetLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
 		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('OCTET_LENGTH(' . $quotedName . ')' . $alias);
+		return new QueryFunction('OCTET_LENGTH('.$quotedName.')'.$alias);
 	}
 
 	public function charLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
 		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('CHAR_LENGTH(' . $quotedName . ')' . $alias);
+		return new QueryFunction('CHAR_LENGTH('.$quotedName.')'.$alias);
 	}
 
 	public function max($field): IQueryFunction {
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('MAX('.$this->helper->quoteColumnName($field).')');
 	}
 
 	public function min($field): IQueryFunction {
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('MIN('.$this->helper->quoteColumnName($field).')');
 	}
 
 	public function greatest($x, $y): IQueryFunction {
-		return new QueryFunction('GREATEST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('GREATEST('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 
 	public function least($x, $y): IQueryFunction {
-		return new QueryFunction('LEAST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('LEAST('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 }

Indentation +90 added lines, -90 removed lines

@@ -14,94 +14,94 @@
 use OCP\IDBConnection;
 
 class FunctionBuilder implements IFunctionBuilder {
-	/** @var IDBConnection|Connection */
-	protected $connection;
-
-	/** @var IQueryBuilder */
-	protected $queryBuilder;
-
-	/** @var QuoteHelper */
-	protected $helper;
-
-	public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder, QuoteHelper $helper) {
-		$this->connection = $connection;
-		$this->queryBuilder = $queryBuilder;
-		$this->helper = $helper;
-	}
-
-	public function md5($input): IQueryFunction {
-		return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
-	}
-
-	public function concat($x, ...$expr): IQueryFunction {
-		$args = func_get_args();
-		$list = [];
-		foreach ($args as $item) {
-			$list[] = $this->helper->quoteColumnName($item);
-		}
-		return new QueryFunction(sprintf('CONCAT(%s)', implode(', ', $list)));
-	}
-
-	public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
-		$separator = $this->connection->quote($separator);
-		return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ' SEPARATOR ' . $separator . ')');
-	}
-
-	public function substring($input, $start, $length = null): IQueryFunction {
-		if ($length) {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
-		} else {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
-		}
-	}
-
-	public function sum($field): IQueryFunction {
-		return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
-	}
-
-	public function lower($field): IQueryFunction {
-		return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
-	}
-
-	public function add($x, $y): IQueryFunction {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' + ' . $this->helper->quoteColumnName($y));
-	}
-
-	public function subtract($x, $y): IQueryFunction {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' - ' . $this->helper->quoteColumnName($y));
-	}
-
-	public function count($count = '', $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
-		$quotedName = $count === '' ? '*' : $this->helper->quoteColumnName($count);
-		return new QueryFunction('COUNT(' . $quotedName . ')' . $alias);
-	}
-
-	public function octetLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
-		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('OCTET_LENGTH(' . $quotedName . ')' . $alias);
-	}
-
-	public function charLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
-		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('CHAR_LENGTH(' . $quotedName . ')' . $alias);
-	}
-
-	public function max($field): IQueryFunction {
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($field) . ')');
-	}
-
-	public function min($field): IQueryFunction {
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($field) . ')');
-	}
-
-	public function greatest($x, $y): IQueryFunction {
-		return new QueryFunction('GREATEST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
-
-	public function least($x, $y): IQueryFunction {
-		return new QueryFunction('LEAST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
+    /** @var IDBConnection|Connection */
+    protected $connection;
+
+    /** @var IQueryBuilder */
+    protected $queryBuilder;
+
+    /** @var QuoteHelper */
+    protected $helper;
+
+    public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder, QuoteHelper $helper) {
+        $this->connection = $connection;
+        $this->queryBuilder = $queryBuilder;
+        $this->helper = $helper;
+    }
+
+    public function md5($input): IQueryFunction {
+        return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
+    }
+
+    public function concat($x, ...$expr): IQueryFunction {
+        $args = func_get_args();
+        $list = [];
+        foreach ($args as $item) {
+            $list[] = $this->helper->quoteColumnName($item);
+        }
+        return new QueryFunction(sprintf('CONCAT(%s)', implode(', ', $list)));
+    }
+
+    public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
+        $separator = $this->connection->quote($separator);
+        return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ' SEPARATOR ' . $separator . ')');
+    }
+
+    public function substring($input, $start, $length = null): IQueryFunction {
+        if ($length) {
+            return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
+        } else {
+            return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
+        }
+    }
+
+    public function sum($field): IQueryFunction {
+        return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
+    }
+
+    public function lower($field): IQueryFunction {
+        return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
+    }
+
+    public function add($x, $y): IQueryFunction {
+        return new QueryFunction($this->helper->quoteColumnName($x) . ' + ' . $this->helper->quoteColumnName($y));
+    }
+
+    public function subtract($x, $y): IQueryFunction {
+        return new QueryFunction($this->helper->quoteColumnName($x) . ' - ' . $this->helper->quoteColumnName($y));
+    }
+
+    public function count($count = '', $alias = ''): IQueryFunction {
+        $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+        $quotedName = $count === '' ? '*' : $this->helper->quoteColumnName($count);
+        return new QueryFunction('COUNT(' . $quotedName . ')' . $alias);
+    }
+
+    public function octetLength($field, $alias = ''): IQueryFunction {
+        $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+        $quotedName = $this->helper->quoteColumnName($field);
+        return new QueryFunction('OCTET_LENGTH(' . $quotedName . ')' . $alias);
+    }
+
+    public function charLength($field, $alias = ''): IQueryFunction {
+        $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+        $quotedName = $this->helper->quoteColumnName($field);
+        return new QueryFunction('CHAR_LENGTH(' . $quotedName . ')' . $alias);
+    }
+
+    public function max($field): IQueryFunction {
+        return new QueryFunction('MAX(' . $this->helper->quoteColumnName($field) . ')');
+    }
+
+    public function min($field): IQueryFunction {
+        return new QueryFunction('MIN(' . $this->helper->quoteColumnName($field) . ')');
+    }
+
+    public function greatest($x, $y): IQueryFunction {
+        return new QueryFunction('GREATEST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
+
+    public function least($x, $y): IQueryFunction {
+        return new QueryFunction('LEAST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
 }

lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -38,26 +38,26 @@
 
 	public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
 		$separator = $this->connection->quote($separator);
-		return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ', ' . $separator . ')');
+		return new QueryFunction('GROUP_CONCAT('.$this->helper->quoteColumnName($expr).', '.$separator.')');
 	}
 
 	public function greatest($x, $y): IQueryFunction {
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('MAX('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 
 	public function least($x, $y): IQueryFunction {
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('MIN('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 
 	public function octetLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
 		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('LENGTH(CAST(' . $quotedName . ' as BLOB))' . $alias);
+		return new QueryFunction('LENGTH(CAST('.$quotedName.' as BLOB))'.$alias);
 	}
 
 	public function charLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
 		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
+		return new QueryFunction('LENGTH('.$quotedName.')'.$alias);
 	}
 }

Indentation +33 added lines, -33 removed lines

@@ -10,37 +10,37 @@
 use OCP\DB\QueryBuilder\IQueryFunction;
 
 class SqliteFunctionBuilder extends FunctionBuilder {
-	public function concat($x, ...$expr): IQueryFunction {
-		$args = func_get_args();
-		$list = [];
-		foreach ($args as $item) {
-			$list[] = $this->helper->quoteColumnName($item);
-		}
-		return new QueryFunction(sprintf('(%s)', implode(' || ', $list)));
-	}
-
-	public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
-		$separator = $this->connection->quote($separator);
-		return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ', ' . $separator . ')');
-	}
-
-	public function greatest($x, $y): IQueryFunction {
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
-
-	public function least($x, $y): IQueryFunction {
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
-
-	public function octetLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
-		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('LENGTH(CAST(' . $quotedName . ' as BLOB))' . $alias);
-	}
-
-	public function charLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
-		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
-	}
+    public function concat($x, ...$expr): IQueryFunction {
+        $args = func_get_args();
+        $list = [];
+        foreach ($args as $item) {
+            $list[] = $this->helper->quoteColumnName($item);
+        }
+        return new QueryFunction(sprintf('(%s)', implode(' || ', $list)));
+    }
+
+    public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
+        $separator = $this->connection->quote($separator);
+        return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ', ' . $separator . ')');
+    }
+
+    public function greatest($x, $y): IQueryFunction {
+        return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
+
+    public function least($x, $y): IQueryFunction {
+        return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
+
+    public function octetLength($field, $alias = ''): IQueryFunction {
+        $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+        $quotedName = $this->helper->quoteColumnName($field);
+        return new QueryFunction('LENGTH(CAST(' . $quotedName . ' as BLOB))' . $alias);
+    }
+
+    public function charLength($field, $alias = ''): IQueryFunction {
+        $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+        $quotedName = $this->helper->quoteColumnName($field);
+        return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
+    }
 }

apps/user_ldap/lib/Migration/Version1120Date20210917155206.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 
 	protected function emitUnassign(string $oldId, bool $pre): void {
 		if ($this->userManager instanceof PublicEmitter) {
-			$this->userManager->emit('\OC\User', $pre ? 'pre' : 'post' . 'UnassignedUserId', [$oldId]);
+			$this->userManager->emit('\OC\User', $pre ? 'pre' : 'post'.'UnassignedUserId', [$oldId]);
 		}
 	}
 

Indentation +106 added lines, -106 removed lines

@@ -22,110 +22,110 @@
 
 class Version1120Date20210917155206 extends SimpleMigrationStep {
 
-	public function __construct(
-		private IDBConnection $dbc,
-		private IUserManager $userManager,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	public function getName() {
-		return 'Adjust LDAP user and group id column lengths to match server lengths';
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 */
-	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-		// ensure that there is no user or group id longer than 64char in LDAP table
-		$this->handleIDs('ldap_group_mapping', false);
-		$this->handleIDs('ldap_user_mapping', true);
-	}
-
-	/**
-	 * @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);
-			$column = $table->getColumn('owncloud_name');
-			if ($column->getLength() > 64) {
-				$column->setLength(64);
-				$changeSchema = true;
-			}
-		}
-
-		return $changeSchema ? $schema : null;
-	}
-
-	protected function handleIDs(string $table, bool $emitHooks) {
-		$select = $this->getSelectQuery($table);
-		$update = $this->getUpdateQuery($table);
-
-		$result = $select->executeQuery();
-		while ($row = $result->fetch()) {
-			$newId = hash('sha256', $row['owncloud_name'], false);
-			if ($emitHooks) {
-				$this->emitUnassign($row['owncloud_name'], true);
-			}
-			$update->setParameter('uuid', $row['directory_uuid']);
-			$update->setParameter('newId', $newId);
-			try {
-				$update->executeStatement();
-				if ($emitHooks) {
-					$this->emitUnassign($row['owncloud_name'], false);
-					$this->emitAssign($newId);
-				}
-			} catch (Exception $e) {
-				$this->logger->error('Failed to shorten owncloud_name "{oldId}" to "{newId}" (UUID: "{uuid}" of {table})',
-					[
-						'app' => 'user_ldap',
-						'oldId' => $row['owncloud_name'],
-						'newId' => $newId,
-						'uuid' => $row['directory_uuid'],
-						'table' => $table,
-						'exception' => $e,
-					]
-				);
-			}
-		}
-		$result->closeCursor();
-	}
-
-	protected function getSelectQuery(string $table): IQueryBuilder {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->select('owncloud_name', 'directory_uuid')
-			->from($table)
-			->where($qb->expr()->gt($qb->func()->octetLength('owncloud_name'), $qb->createNamedParameter('64'), IQueryBuilder::PARAM_INT));
-		return $qb;
-	}
-
-	protected function getUpdateQuery(string $table): IQueryBuilder {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->update($table)
-			->set('owncloud_name', $qb->createParameter('newId'))
-			->where($qb->expr()->eq('directory_uuid', $qb->createParameter('uuid')));
-		return $qb;
-	}
-
-	protected function emitUnassign(string $oldId, bool $pre): void {
-		if ($this->userManager instanceof PublicEmitter) {
-			$this->userManager->emit('\OC\User', $pre ? 'pre' : 'post' . 'UnassignedUserId', [$oldId]);
-		}
-	}
-
-	protected function emitAssign(string $newId): void {
-		if ($this->userManager instanceof PublicEmitter) {
-			$this->userManager->emit('\OC\User', 'assignedUserId', [$newId]);
-		}
-	}
+    public function __construct(
+        private IDBConnection $dbc,
+        private IUserManager $userManager,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    public function getName() {
+        return 'Adjust LDAP user and group id column lengths to match server lengths';
+    }
+
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     */
+    public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+        // ensure that there is no user or group id longer than 64char in LDAP table
+        $this->handleIDs('ldap_group_mapping', false);
+        $this->handleIDs('ldap_user_mapping', true);
+    }
+
+    /**
+     * @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);
+            $column = $table->getColumn('owncloud_name');
+            if ($column->getLength() > 64) {
+                $column->setLength(64);
+                $changeSchema = true;
+            }
+        }
+
+        return $changeSchema ? $schema : null;
+    }
+
+    protected function handleIDs(string $table, bool $emitHooks) {
+        $select = $this->getSelectQuery($table);
+        $update = $this->getUpdateQuery($table);
+
+        $result = $select->executeQuery();
+        while ($row = $result->fetch()) {
+            $newId = hash('sha256', $row['owncloud_name'], false);
+            if ($emitHooks) {
+                $this->emitUnassign($row['owncloud_name'], true);
+            }
+            $update->setParameter('uuid', $row['directory_uuid']);
+            $update->setParameter('newId', $newId);
+            try {
+                $update->executeStatement();
+                if ($emitHooks) {
+                    $this->emitUnassign($row['owncloud_name'], false);
+                    $this->emitAssign($newId);
+                }
+            } catch (Exception $e) {
+                $this->logger->error('Failed to shorten owncloud_name "{oldId}" to "{newId}" (UUID: "{uuid}" of {table})',
+                    [
+                        'app' => 'user_ldap',
+                        'oldId' => $row['owncloud_name'],
+                        'newId' => $newId,
+                        'uuid' => $row['directory_uuid'],
+                        'table' => $table,
+                        'exception' => $e,
+                    ]
+                );
+            }
+        }
+        $result->closeCursor();
+    }
+
+    protected function getSelectQuery(string $table): IQueryBuilder {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->select('owncloud_name', 'directory_uuid')
+            ->from($table)
+            ->where($qb->expr()->gt($qb->func()->octetLength('owncloud_name'), $qb->createNamedParameter('64'), IQueryBuilder::PARAM_INT));
+        return $qb;
+    }
+
+    protected function getUpdateQuery(string $table): IQueryBuilder {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->update($table)
+            ->set('owncloud_name', $qb->createParameter('newId'))
+            ->where($qb->expr()->eq('directory_uuid', $qb->createParameter('uuid')));
+        return $qb;
+    }
+
+    protected function emitUnassign(string $oldId, bool $pre): void {
+        if ($this->userManager instanceof PublicEmitter) {
+            $this->userManager->emit('\OC\User', $pre ? 'pre' : 'post' . 'UnassignedUserId', [$oldId]);
+        }
+    }
+
+    protected function emitAssign(string $newId): void {
+        if ($this->userManager instanceof PublicEmitter) {
+            $this->userManager->emit('\OC\User', 'assignedUserId', [$newId]);
+        }
+    }
 }

lib/private/Files/ObjectStore/SwiftFactory.php

Spacing +5 added lines, -5 removed lines

@@ -91,7 +91,7 @@ 
 	}
 
 	private function getCachedToken(string $cacheKey) {
-		$cachedTokenString = $this->cache->get($cacheKey . '/token');
+		$cachedTokenString = $this->cache->get($cacheKey.'/token');
 		if ($cachedTokenString) {
 			return json_decode($cachedTokenString, true);
 		} else {
@@ -117,7 +117,7 @@ 
 		}
 
 		$this->params['cachedToken'] = $value;
-		$this->cache->set($cacheKey . '/token', json_encode($value));
+		$this->cache->set($cacheKey.'/token', json_encode($value));
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 		}
 		$this->params = array_merge(self::DEFAULT_OPTIONS, $this->params);
 
-		$cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['container'];
+		$cacheKey = $userName.'@'.$this->params['url'].'/'.$this->params['container'];
 		$token = $this->getCachedToken($cacheKey);
 		$this->params['cachedToken'] = $token;
 
@@ -184,7 +184,7 @@ 
 			if ($authService instanceof IdentityV3Service) {
 				$token = $authService->generateTokenFromCache($cachedToken);
 				if (\is_null($token->catalog)) {
-					$this->logger->warning('Invalid cached token for swift, no catalog set: ' . json_encode($cachedToken));
+					$this->logger->warning('Invalid cached token for swift, no catalog set: '.json_encode($cachedToken));
 				} elseif ($token->hasExpired()) {
 					$this->logger->debug('Cached token for swift expired');
 				} else {
@@ -278,7 +278,7 @@ 
 		} catch (ConnectException $e) {
 			/** @var RequestInterface $request */
 			$request = $e->getRequest();
-			$host = $request->getUri()->getHost() . ':' . $request->getUri()->getPort();
+			$host = $request->getUri()->getHost().':'.$request->getUri()->getPort();
 			$this->logger->error("Can't connect to object storage server at $host", ['exception' => $e]);
 			throw new StorageNotAvailableException("Can't connect to object storage server at $host", StorageNotAvailableException::STATUS_ERROR, $e);
 		}

Indentation +208 added lines, -208 removed lines

@@ -28,235 +28,235 @@
 use Psr\Log\LoggerInterface;
 
 class SwiftFactory {
-	private $cache;
-	private $params;
-	/** @var Container|null */
-	private $container = null;
-	private LoggerInterface $logger;
+    private $cache;
+    private $params;
+    /** @var Container|null */
+    private $container = null;
+    private LoggerInterface $logger;
 
-	public const DEFAULT_OPTIONS = [
-		'autocreate' => false,
-		'urlType' => 'publicURL',
-		'catalogName' => 'swift',
-		'catalogType' => 'object-store'
-	];
+    public const DEFAULT_OPTIONS = [
+        'autocreate' => false,
+        'urlType' => 'publicURL',
+        'catalogName' => 'swift',
+        'catalogType' => 'object-store'
+    ];
 
-	public function __construct(ICache $cache, array $params, LoggerInterface $logger) {
-		$this->cache = $cache;
-		$this->params = $params;
-		$this->logger = $logger;
-	}
+    public function __construct(ICache $cache, array $params, LoggerInterface $logger) {
+        $this->cache = $cache;
+        $this->params = $params;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Gets currently cached token id
-	 *
-	 * @return string
-	 * @throws StorageAuthException
-	 */
-	public function getCachedTokenId() {
-		if (!isset($this->params['cachedToken'])) {
-			throw new StorageAuthException('Unauthenticated ObjectStore connection');
-		}
+    /**
+     * Gets currently cached token id
+     *
+     * @return string
+     * @throws StorageAuthException
+     */
+    public function getCachedTokenId() {
+        if (!isset($this->params['cachedToken'])) {
+            throw new StorageAuthException('Unauthenticated ObjectStore connection');
+        }
 
-		// Is it V2 token?
-		if (isset($this->params['cachedToken']['token'])) {
-			return $this->params['cachedToken']['token']['id'];
-		}
+        // Is it V2 token?
+        if (isset($this->params['cachedToken']['token'])) {
+            return $this->params['cachedToken']['token']['id'];
+        }
 
-		return $this->params['cachedToken']['id'];
-	}
+        return $this->params['cachedToken']['id'];
+    }
 
-	private function getCachedToken(string $cacheKey) {
-		$cachedTokenString = $this->cache->get($cacheKey . '/token');
-		if ($cachedTokenString) {
-			return json_decode($cachedTokenString, true);
-		} else {
-			return null;
-		}
-	}
+    private function getCachedToken(string $cacheKey) {
+        $cachedTokenString = $this->cache->get($cacheKey . '/token');
+        if ($cachedTokenString) {
+            return json_decode($cachedTokenString, true);
+        } else {
+            return null;
+        }
+    }
 
-	private function cacheToken(Token $token, string $serviceUrl, string $cacheKey) {
-		if ($token instanceof \OpenStack\Identity\v3\Models\Token) {
-			// for v3 the catalog is cached as part of the token, so no need to cache $serviceUrl separately
-			$value = $token->export();
-		} else {
-			/** @var \OpenStack\Identity\v2\Models\Token $token */
-			$value = [
-				'serviceUrl' => $serviceUrl,
-				'token' => [
-					'issued_at' => $token->issuedAt->format('c'),
-					'expires' => $token->expires->format('c'),
-					'id' => $token->id,
-					'tenant' => $token->tenant
-				]
-			];
-		}
+    private function cacheToken(Token $token, string $serviceUrl, string $cacheKey) {
+        if ($token instanceof \OpenStack\Identity\v3\Models\Token) {
+            // for v3 the catalog is cached as part of the token, so no need to cache $serviceUrl separately
+            $value = $token->export();
+        } else {
+            /** @var \OpenStack\Identity\v2\Models\Token $token */
+            $value = [
+                'serviceUrl' => $serviceUrl,
+                'token' => [
+                    'issued_at' => $token->issuedAt->format('c'),
+                    'expires' => $token->expires->format('c'),
+                    'id' => $token->id,
+                    'tenant' => $token->tenant
+                ]
+            ];
+        }
 
-		$this->params['cachedToken'] = $value;
-		$this->cache->set($cacheKey . '/token', json_encode($value));
-	}
+        $this->params['cachedToken'] = $value;
+        $this->cache->set($cacheKey . '/token', json_encode($value));
+    }
 
-	/**
-	 * @return OpenStack
-	 * @throws StorageAuthException
-	 */
-	private function getClient() {
-		if (isset($this->params['bucket'])) {
-			$this->params['container'] = $this->params['bucket'];
-		}
-		if (!isset($this->params['container'])) {
-			$this->params['container'] = 'nextcloud';
-		}
-		if (isset($this->params['user']) && is_array($this->params['user'])) {
-			$userName = $this->params['user']['name'];
-		} else {
-			if (!isset($this->params['username']) && isset($this->params['user'])) {
-				$this->params['username'] = $this->params['user'];
-			}
-			$userName = $this->params['username'];
-		}
-		if (!isset($this->params['tenantName']) && isset($this->params['tenant'])) {
-			$this->params['tenantName'] = $this->params['tenant'];
-		}
-		if (isset($this->params['domain'])) {
-			$this->params['scope']['project']['name'] = $this->params['tenant'];
-			$this->params['scope']['project']['domain']['name'] = $this->params['domain'];
-		}
-		$this->params = array_merge(self::DEFAULT_OPTIONS, $this->params);
+    /**
+     * @return OpenStack
+     * @throws StorageAuthException
+     */
+    private function getClient() {
+        if (isset($this->params['bucket'])) {
+            $this->params['container'] = $this->params['bucket'];
+        }
+        if (!isset($this->params['container'])) {
+            $this->params['container'] = 'nextcloud';
+        }
+        if (isset($this->params['user']) && is_array($this->params['user'])) {
+            $userName = $this->params['user']['name'];
+        } else {
+            if (!isset($this->params['username']) && isset($this->params['user'])) {
+                $this->params['username'] = $this->params['user'];
+            }
+            $userName = $this->params['username'];
+        }
+        if (!isset($this->params['tenantName']) && isset($this->params['tenant'])) {
+            $this->params['tenantName'] = $this->params['tenant'];
+        }
+        if (isset($this->params['domain'])) {
+            $this->params['scope']['project']['name'] = $this->params['tenant'];
+            $this->params['scope']['project']['domain']['name'] = $this->params['domain'];
+        }
+        $this->params = array_merge(self::DEFAULT_OPTIONS, $this->params);
 
-		$cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['container'];
-		$token = $this->getCachedToken($cacheKey);
-		$this->params['cachedToken'] = $token;
+        $cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['container'];
+        $token = $this->getCachedToken($cacheKey);
+        $this->params['cachedToken'] = $token;
 
-		$httpClient = new Client([
-			'base_uri' => TransportUtils::normalizeUrl($this->params['url']),
-			'handler' => HandlerStack::create()
-		]);
+        $httpClient = new Client([
+            'base_uri' => TransportUtils::normalizeUrl($this->params['url']),
+            'handler' => HandlerStack::create()
+        ]);
 
-		if (isset($this->params['user']) && is_array($this->params['user']) && isset($this->params['user']['name'])) {
-			if (!isset($this->params['scope'])) {
-				throw new StorageAuthException('Scope has to be defined for V3 requests');
-			}
+        if (isset($this->params['user']) && is_array($this->params['user']) && isset($this->params['user']['name'])) {
+            if (!isset($this->params['scope'])) {
+                throw new StorageAuthException('Scope has to be defined for V3 requests');
+            }
 
-			return $this->auth(IdentityV3Service::factory($httpClient), $cacheKey);
-		} else {
-			return $this->auth(SwiftV2CachingAuthService::factory($httpClient), $cacheKey);
-		}
-	}
+            return $this->auth(IdentityV3Service::factory($httpClient), $cacheKey);
+        } else {
+            return $this->auth(SwiftV2CachingAuthService::factory($httpClient), $cacheKey);
+        }
+    }
 
-	/**
-	 * @param IdentityV2Service|IdentityV3Service $authService
-	 * @param string $cacheKey
-	 * @return OpenStack
-	 * @throws StorageAuthException
-	 */
-	private function auth($authService, string $cacheKey) {
-		$this->params['identityService'] = $authService;
-		$this->params['authUrl'] = $this->params['url'];
+    /**
+     * @param IdentityV2Service|IdentityV3Service $authService
+     * @param string $cacheKey
+     * @return OpenStack
+     * @throws StorageAuthException
+     */
+    private function auth($authService, string $cacheKey) {
+        $this->params['identityService'] = $authService;
+        $this->params['authUrl'] = $this->params['url'];
 
-		$cachedToken = $this->params['cachedToken'];
-		$hasValidCachedToken = false;
-		if (\is_array($cachedToken)) {
-			if ($authService instanceof IdentityV3Service) {
-				$token = $authService->generateTokenFromCache($cachedToken);
-				if (\is_null($token->catalog)) {
-					$this->logger->warning('Invalid cached token for swift, no catalog set: ' . json_encode($cachedToken));
-				} elseif ($token->hasExpired()) {
-					$this->logger->debug('Cached token for swift expired');
-				} else {
-					$hasValidCachedToken = true;
-				}
-			} else {
-				try {
-					/** @var \OpenStack\Identity\v2\Models\Token $token */
-					$token = $authService->model(\OpenStack\Identity\v2\Models\Token::class, $cachedToken['token']);
-					$now = new \DateTimeImmutable('now');
-					if ($token->expires > $now) {
-						$hasValidCachedToken = true;
-						$this->params['v2cachedToken'] = $token;
-						$this->params['v2serviceUrl'] = $cachedToken['serviceUrl'];
-					} else {
-						$this->logger->debug('Cached token for swift expired');
-					}
-				} catch (\Exception $e) {
-					$this->logger->error($e->getMessage(), ['exception' => $e]);
-				}
-			}
-		}
+        $cachedToken = $this->params['cachedToken'];
+        $hasValidCachedToken = false;
+        if (\is_array($cachedToken)) {
+            if ($authService instanceof IdentityV3Service) {
+                $token = $authService->generateTokenFromCache($cachedToken);
+                if (\is_null($token->catalog)) {
+                    $this->logger->warning('Invalid cached token for swift, no catalog set: ' . json_encode($cachedToken));
+                } elseif ($token->hasExpired()) {
+                    $this->logger->debug('Cached token for swift expired');
+                } else {
+                    $hasValidCachedToken = true;
+                }
+            } else {
+                try {
+                    /** @var \OpenStack\Identity\v2\Models\Token $token */
+                    $token = $authService->model(\OpenStack\Identity\v2\Models\Token::class, $cachedToken['token']);
+                    $now = new \DateTimeImmutable('now');
+                    if ($token->expires > $now) {
+                        $hasValidCachedToken = true;
+                        $this->params['v2cachedToken'] = $token;
+                        $this->params['v2serviceUrl'] = $cachedToken['serviceUrl'];
+                    } else {
+                        $this->logger->debug('Cached token for swift expired');
+                    }
+                } catch (\Exception $e) {
+                    $this->logger->error($e->getMessage(), ['exception' => $e]);
+                }
+            }
+        }
 
-		if (!$hasValidCachedToken) {
-			unset($this->params['cachedToken']);
-			try {
-				[$token, $serviceUrl] = $authService->authenticate($this->params);
-				$this->cacheToken($token, $serviceUrl, $cacheKey);
-			} catch (ConnectException $e) {
-				throw new StorageAuthException('Failed to connect to keystone, verify the keystone url', $e);
-			} catch (ClientException $e) {
-				$statusCode = $e->getResponse()->getStatusCode();
-				if ($statusCode === 404) {
-					throw new StorageAuthException('Keystone not found while connecting to object storage, verify the keystone url', $e);
-				} elseif ($statusCode === 412) {
-					throw new StorageAuthException('Precondition failed while connecting to object storage, verify the keystone url', $e);
-				} elseif ($statusCode === 401) {
-					throw new StorageAuthException('Authentication failed while connecting to object storage, verify the username, password and possibly tenant', $e);
-				} else {
-					throw new StorageAuthException('Unknown error while connecting to object storage', $e);
-				}
-			} catch (RequestException $e) {
-				throw new StorageAuthException('Connection reset while connecting to keystone, verify the keystone url', $e);
-			}
-		}
+        if (!$hasValidCachedToken) {
+            unset($this->params['cachedToken']);
+            try {
+                [$token, $serviceUrl] = $authService->authenticate($this->params);
+                $this->cacheToken($token, $serviceUrl, $cacheKey);
+            } catch (ConnectException $e) {
+                throw new StorageAuthException('Failed to connect to keystone, verify the keystone url', $e);
+            } catch (ClientException $e) {
+                $statusCode = $e->getResponse()->getStatusCode();
+                if ($statusCode === 404) {
+                    throw new StorageAuthException('Keystone not found while connecting to object storage, verify the keystone url', $e);
+                } elseif ($statusCode === 412) {
+                    throw new StorageAuthException('Precondition failed while connecting to object storage, verify the keystone url', $e);
+                } elseif ($statusCode === 401) {
+                    throw new StorageAuthException('Authentication failed while connecting to object storage, verify the username, password and possibly tenant', $e);
+                } else {
+                    throw new StorageAuthException('Unknown error while connecting to object storage', $e);
+                }
+            } catch (RequestException $e) {
+                throw new StorageAuthException('Connection reset while connecting to keystone, verify the keystone url', $e);
+            }
+        }
 
 
-		$client = new OpenStack($this->params);
+        $client = new OpenStack($this->params);
 
-		return $client;
-	}
+        return $client;
+    }
 
-	/**
-	 * @return \OpenStack\ObjectStore\v1\Models\Container
-	 * @throws StorageAuthException
-	 * @throws StorageNotAvailableException
-	 */
-	public function getContainer() {
-		if (is_null($this->container)) {
-			$this->container = $this->createContainer();
-		}
+    /**
+     * @return \OpenStack\ObjectStore\v1\Models\Container
+     * @throws StorageAuthException
+     * @throws StorageNotAvailableException
+     */
+    public function getContainer() {
+        if (is_null($this->container)) {
+            $this->container = $this->createContainer();
+        }
 
-		return $this->container;
-	}
+        return $this->container;
+    }
 
-	/**
-	 * @return \OpenStack\ObjectStore\v1\Models\Container
-	 * @throws StorageAuthException
-	 * @throws StorageNotAvailableException
-	 */
-	private function createContainer() {
-		$client = $this->getClient();
-		$objectStoreService = $client->objectStoreV1();
+    /**
+     * @return \OpenStack\ObjectStore\v1\Models\Container
+     * @throws StorageAuthException
+     * @throws StorageNotAvailableException
+     */
+    private function createContainer() {
+        $client = $this->getClient();
+        $objectStoreService = $client->objectStoreV1();
 
-		$autoCreate = isset($this->params['autocreate']) && $this->params['autocreate'] === true;
-		try {
-			$container = $objectStoreService->getContainer($this->params['container']);
-			if ($autoCreate) {
-				$container->getMetadata();
-			}
-			return $container;
-		} catch (BadResponseError $ex) {
-			// if the container does not exist and autocreate is true try to create the container on the fly
-			if ($ex->getResponse()->getStatusCode() === 404 && $autoCreate) {
-				return $objectStoreService->createContainer([
-					'name' => $this->params['container']
-				]);
-			} else {
-				throw new StorageNotAvailableException('Invalid response while trying to get container info', StorageNotAvailableException::STATUS_ERROR, $ex);
-			}
-		} catch (ConnectException $e) {
-			/** @var RequestInterface $request */
-			$request = $e->getRequest();
-			$host = $request->getUri()->getHost() . ':' . $request->getUri()->getPort();
-			$this->logger->error("Can't connect to object storage server at $host", ['exception' => $e]);
-			throw new StorageNotAvailableException("Can't connect to object storage server at $host", StorageNotAvailableException::STATUS_ERROR, $e);
-		}
-	}
+        $autoCreate = isset($this->params['autocreate']) && $this->params['autocreate'] === true;
+        try {
+            $container = $objectStoreService->getContainer($this->params['container']);
+            if ($autoCreate) {
+                $container->getMetadata();
+            }
+            return $container;
+        } catch (BadResponseError $ex) {
+            // if the container does not exist and autocreate is true try to create the container on the fly
+            if ($ex->getResponse()->getStatusCode() === 404 && $autoCreate) {
+                return $objectStoreService->createContainer([
+                    'name' => $this->params['container']
+                ]);
+            } else {
+                throw new StorageNotAvailableException('Invalid response while trying to get container info', StorageNotAvailableException::STATUS_ERROR, $ex);
+            }
+        } catch (ConnectException $e) {
+            /** @var RequestInterface $request */
+            $request = $e->getRequest();
+            $host = $request->getUri()->getHost() . ':' . $request->getUri()->getPort();
+            $this->logger->error("Can't connect to object storage server at $host", ['exception' => $e]);
+            throw new StorageNotAvailableException("Can't connect to object storage server at $host", StorageNotAvailableException::STATUS_ERROR, $e);
+        }
+    }
 }

lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 			return;
 		}
 
-		$folders = array_filter($folders, function (ISimpleFolder $folder) {
+		$folders = array_filter($folders, function(ISimpleFolder $folder) {
 			return $folder->fileExists('photo.');
 		});
 
@@ -82,7 +82,7 @@ 
 			return;
 		}
 
-		$output->info('Delete ' . count($folders) . ' "photo." files');
+		$output->info('Delete '.count($folders).' "photo." files');
 
 		foreach ($folders as $folder) {
 			try {
@@ -90,7 +90,7 @@ 
 				$folder->getFile('photo.')->delete();
 			} catch (\Exception $e) {
 				$this->logger->error($e->getMessage(), ['exception' => $e]);
-				$output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
+				$output->warning('Could not delete file "dav-photocache/'.$folder->getName().'/photo."');
 			}
 		}
 	}

Indentation +48 added lines, -48 removed lines

@@ -28,61 +28,61 @@
  * photo could be returned for this vcard. These invalid files are removed by this migration step.
  */
 class CleanupCardDAVPhotoCache implements IRepairStep {
-	public function __construct(
-		private IConfig $config,
-		private IAppDataFactory $appDataFactory,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+        private IAppDataFactory $appDataFactory,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function getName(): string {
-		return 'Cleanup invalid photocache files for carddav';
-	}
+    public function getName(): string {
+        return 'Cleanup invalid photocache files for carddav';
+    }
 
-	private function repair(IOutput $output): void {
-		$photoCacheAppData = $this->appDataFactory->get('dav-photocache');
+    private function repair(IOutput $output): void {
+        $photoCacheAppData = $this->appDataFactory->get('dav-photocache');
 
-		try {
-			$folders = $photoCacheAppData->getDirectoryListing();
-		} catch (NotFoundException $e) {
-			return;
-		} catch (RuntimeException $e) {
-			$this->logger->error('Failed to fetch directory listing in CleanupCardDAVPhotoCache', ['exception' => $e]);
-			return;
-		}
+        try {
+            $folders = $photoCacheAppData->getDirectoryListing();
+        } catch (NotFoundException $e) {
+            return;
+        } catch (RuntimeException $e) {
+            $this->logger->error('Failed to fetch directory listing in CleanupCardDAVPhotoCache', ['exception' => $e]);
+            return;
+        }
 
-		$folders = array_filter($folders, function (ISimpleFolder $folder) {
-			return $folder->fileExists('photo.');
-		});
+        $folders = array_filter($folders, function (ISimpleFolder $folder) {
+            return $folder->fileExists('photo.');
+        });
 
-		if (empty($folders)) {
-			return;
-		}
+        if (empty($folders)) {
+            return;
+        }
 
-		$output->info('Delete ' . count($folders) . ' "photo." files');
+        $output->info('Delete ' . count($folders) . ' "photo." files');
 
-		foreach ($folders as $folder) {
-			try {
-				/** @var ISimpleFolder $folder */
-				$folder->getFile('photo.')->delete();
-			} catch (\Exception $e) {
-				$this->logger->error($e->getMessage(), ['exception' => $e]);
-				$output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
-			}
-		}
-	}
+        foreach ($folders as $folder) {
+            try {
+                /** @var ISimpleFolder $folder */
+                $folder->getFile('photo.')->delete();
+            } catch (\Exception $e) {
+                $this->logger->error($e->getMessage(), ['exception' => $e]);
+                $output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
+            }
+        }
+    }
 
-	private function shouldRun(): bool {
-		return version_compare(
-			$this->config->getSystemValueString('version', '0.0.0.0'),
-			'16.0.0.0',
-			'<='
-		);
-	}
+    private function shouldRun(): bool {
+        return version_compare(
+            $this->config->getSystemValueString('version', '0.0.0.0'),
+            '16.0.0.0',
+            '<='
+        );
+    }
 
-	public function run(IOutput $output): void {
-		if ($this->shouldRun()) {
-			$this->repair($output);
-		}
-	}
+    public function run(IOutput $output): void {
+        if ($this->shouldRun()) {
+            $this->repair($output);
+        }
+    }
 }

apps/user_ldap/lib/Migration/Version1130Date20220110154718.php

Indentation +57 added lines, -57 removed lines

@@ -32,68 +32,68 @@
 use OCP\Migration\IOutput;
 
 class Version1130Date20220110154718 extends GroupMappingMigration {
-	public function getName() {
-		return 'Copy ldap_group_mapping data from backup table and if needed';
-	}
+    public function getName() {
+        return 'Copy ldap_group_mapping data from backup table and if needed';
+    }
 
-	/**
-	 * @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();
 
-		if (!$schema->hasTable('ldap_group_mapping_backup')) {
-			// Backup table does not exist
-			return null;
-		}
+        if (!$schema->hasTable('ldap_group_mapping_backup')) {
+            // Backup table does not exist
+            return null;
+        }
 
-		$table = $schema->createTable('ldap_group_mapping');
-		$table->addColumn('ldap_dn', Types::STRING, [
-			'notnull' => true,
-			'length' => 4000,
-			'default' => '',
-		]);
-		$table->addColumn('owncloud_name', Types::STRING, [
-			'notnull' => true,
-			'length' => 64,
-			'default' => '',
-		]);
-		$table->addColumn('directory_uuid', Types::STRING, [
-			'notnull' => true,
-			'length' => 255,
-			'default' => '',
-		]);
-		$table->addColumn('ldap_dn_hash', Types::STRING, [
-			'notnull' => false,
-			'length' => 64,
-		]);
-		$table->setPrimaryKey(['owncloud_name']);
-		$table->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes');
-		$table->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid');
+        $table = $schema->createTable('ldap_group_mapping');
+        $table->addColumn('ldap_dn', Types::STRING, [
+            'notnull' => true,
+            'length' => 4000,
+            'default' => '',
+        ]);
+        $table->addColumn('owncloud_name', Types::STRING, [
+            'notnull' => true,
+            'length' => 64,
+            'default' => '',
+        ]);
+        $table->addColumn('directory_uuid', Types::STRING, [
+            'notnull' => true,
+            'length' => 255,
+            'default' => '',
+        ]);
+        $table->addColumn('ldap_dn_hash', Types::STRING, [
+            'notnull' => false,
+            'length' => 64,
+        ]);
+        $table->setPrimaryKey(['owncloud_name']);
+        $table->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes');
+        $table->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid');
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 */
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     */
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('ldap_group_mapping_backup')) {
-			// Backup table does not exist
-			return;
-		}
+        if (!$schema->hasTable('ldap_group_mapping_backup')) {
+            // Backup table does not exist
+            return;
+        }
 
-		$output->startProgress();
-		$this->copyGroupMappingData('ldap_group_mapping_backup', 'ldap_group_mapping');
-		$output->finishProgress();
-	}
+        $output->startProgress();
+        $this->copyGroupMappingData('ldap_group_mapping_backup', 'ldap_group_mapping');
+        $output->finishProgress();
+    }
 }

apps/user_ldap/lib/Migration/Version1010Date20200630192842.php

Indentation +73 added lines, -73 removed lines

@@ -33,80 +33,80 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1010Date20200630192842 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) {
-		/** @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) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('ldap_user_mapping')) {
-			$table = $schema->createTable('ldap_user_mapping');
-			$table->addColumn('ldap_dn', Types::STRING, [
-				'notnull' => true,
-				'length' => 4000,
-				'default' => '',
-			]);
-			$table->addColumn('owncloud_name', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('directory_uuid', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('ldap_dn_hash', Types::STRING, [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->setPrimaryKey(['owncloud_name']);
-			$table->addUniqueIndex(['ldap_dn_hash'], 'ldap_user_dn_hashes');
-			$table->addUniqueIndex(['directory_uuid'], 'ldap_user_directory_uuid');
-		}
+        if (!$schema->hasTable('ldap_user_mapping')) {
+            $table = $schema->createTable('ldap_user_mapping');
+            $table->addColumn('ldap_dn', Types::STRING, [
+                'notnull' => true,
+                'length' => 4000,
+                'default' => '',
+            ]);
+            $table->addColumn('owncloud_name', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('directory_uuid', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('ldap_dn_hash', Types::STRING, [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->setPrimaryKey(['owncloud_name']);
+            $table->addUniqueIndex(['ldap_dn_hash'], 'ldap_user_dn_hashes');
+            $table->addUniqueIndex(['directory_uuid'], 'ldap_user_directory_uuid');
+        }
 
-		if (!$schema->hasTable('ldap_group_mapping')) {
-			$table = $schema->createTable('ldap_group_mapping');
-			$table->addColumn('ldap_dn', Types::STRING, [
-				'notnull' => true,
-				'length' => 4000,
-				'default' => '',
-			]);
-			$table->addColumn('owncloud_name', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('directory_uuid', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('ldap_dn_hash', Types::STRING, [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->setPrimaryKey(['owncloud_name']);
-			$table->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes');
-			$table->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid');
-		}
+        if (!$schema->hasTable('ldap_group_mapping')) {
+            $table = $schema->createTable('ldap_group_mapping');
+            $table->addColumn('ldap_dn', Types::STRING, [
+                'notnull' => true,
+                'length' => 4000,
+                'default' => '',
+            ]);
+            $table->addColumn('owncloud_name', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('directory_uuid', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('ldap_dn_hash', Types::STRING, [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->setPrimaryKey(['owncloud_name']);
+            $table->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes');
+            $table->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid');
+        }
 
-		if (!$schema->hasTable('ldap_group_members')) {
-			$table = $schema->createTable('ldap_group_members');
-			$table->addColumn('owncloudname', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('owncloudusers', Types::TEXT, [
-				'notnull' => true,
-			]);
-			$table->setPrimaryKey(['owncloudname']);
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('ldap_group_members')) {
+            $table = $schema->createTable('ldap_group_members');
+            $table->addColumn('owncloudname', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('owncloudusers', Types::TEXT, [
+                'notnull' => true,
+            ]);
+            $table->setPrimaryKey(['owncloudname']);
+        }
+        return $schema;
+    }
 }

apps/files_external/lib/Migration/Version1016Date20220324154536.php

Indentation +20 added lines, -20 removed lines

@@ -31,24 +31,24 @@
 
 class Version1016Date20220324154536 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();
-
-		$table = $schema->getTable('external_config');
-		$column = $table->getColumn('value');
-
-		if ($column->getLength() > 4000) {
-			$column->setLength(4000);
-			return $schema;
-		}
-
-		return null;
-	}
+    /**
+     * @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('external_config');
+        $column = $table->getColumn('value');
+
+        if ($column->getLength() > 4000) {
+            $column->setLength(4000);
+            return $schema;
+        }
+
+        return null;
+    }
 }