nextcloud / server

lib/public/Authentication/TwoFactorAuth/IActivatableByAdmin.php

Indentation +10 added lines, -10 removed lines

@@ -37,15 +37,15 @@
  */
 interface IActivatableByAdmin extends IProvider {
 
-	/**
-	 * Enable this provider for the given user.
-	 *
-	 * @param IUser $user the user to activate this provider for
-	 *
-	 * @return void
-	 *
-	 * @since 15.0.0
-	 */
-	public function enableFor(IUser $user);
+    /**
+     * Enable this provider for the given user.
+     *
+     * @param IUser $user the user to activate this provider for
+     *
+     * @return void
+     *
+     * @since 15.0.0
+     */
+    public function enableFor(IUser $user);
 
 }

lib/public/Authentication/TwoFactorAuth/IDeactivatableByAdmin.php

Indentation +10 added lines, -10 removed lines

@@ -37,15 +37,15 @@
  */
 interface IDeactivatableByAdmin extends IProvider {
 
-	/**
-	 * Disable this provider for the given user.
-	 *
-	 * @param IUser $user the user to deactivate this provider for
-	 *
-	 * @return void
-	 *
-	 * @since 15.0.0
-	 */
-	public function disableFor(IUser $user);
+    /**
+     * Disable this provider for the given user.
+     *
+     * @param IUser $user the user to deactivate this provider for
+     *
+     * @return void
+     *
+     * @since 15.0.0
+     */
+    public function disableFor(IUser $user);
 
 }

lib/private/RichObjectStrings/Validator.php

Indentation +83 added lines, -83 removed lines

@@ -38,87 +38,87 @@
  */
 class Validator implements IValidator {
 
-	/** @var Definitions */
-	protected $definitions;
-
-	/** @var array[] */
-	protected $requiredParameters = [];
-
-	/**
-	 * Constructor
-	 *
-	 * @param Definitions $definitions
-	 */
-	public function __construct(Definitions $definitions) {
-		$this->definitions = $definitions;
-	}
-
-	/**
-	 * @param string $subject
-	 * @param array[] $parameters
-	 * @throws InvalidObjectExeption
-	 * @since 11.0.0
-	 */
-	public function validate($subject, array $parameters) {
-		$matches = [];
-		$result = preg_match_all('/\{([a-z0-9]+)\}/i', $subject, $matches);
-
-		if ($result === false) {
-			throw new InvalidObjectExeption();
-		}
-
-		if (!empty($matches[1])) {
-			foreach ($matches[1] as $parameter) {
-				if (!isset($parameters[$parameter])) {
-					throw new InvalidObjectExeption('Parameter is undefined');
-				}
-			}
-		}
-
-		foreach ($parameters as $parameter) {
-			if (!\is_array($parameter)) {
-				throw new InvalidObjectExeption('Parameter is malformed');
-			}
-
-			$this->validateParameter($parameter);
-		}
-	}
-
-	/**
-	 * @param array $parameter
-	 * @throws InvalidObjectExeption
-	 */
-	protected function validateParameter(array $parameter) {
-		if (!isset($parameter['type'])) {
-			throw new InvalidObjectExeption('Object type is undefined');
-		}
-
-		$definition = $this->definitions->getDefinition($parameter['type']);
-		$requiredParameters = $this->getRequiredParameters($parameter['type'], $definition);
-
-		$missingKeys = array_diff($requiredParameters, array_keys($parameter));
-		if (!empty($missingKeys)) {
-			throw new InvalidObjectExeption('Object is invalid');
-		}
-	}
-
-	/**
-	 * @param string $type
-	 * @param array $definition
-	 * @return string[]
-	 */
-	protected function getRequiredParameters($type, array $definition) {
-		if (isset($this->requiredParameters[$type])) {
-			return $this->requiredParameters[$type];
-		}
-
-		$this->requiredParameters[$type] = [];
-		foreach ($definition['parameters'] as $parameter => $data) {
-			if ($data['required']) {
-				$this->requiredParameters[$type][] = $parameter;
-			}
-		}
-
-		return $this->requiredParameters[$type];
-	}
+    /** @var Definitions */
+    protected $definitions;
+
+    /** @var array[] */
+    protected $requiredParameters = [];
+
+    /**
+     * Constructor
+     *
+     * @param Definitions $definitions
+     */
+    public function __construct(Definitions $definitions) {
+        $this->definitions = $definitions;
+    }
+
+    /**
+     * @param string $subject
+     * @param array[] $parameters
+     * @throws InvalidObjectExeption
+     * @since 11.0.0
+     */
+    public function validate($subject, array $parameters) {
+        $matches = [];
+        $result = preg_match_all('/\{([a-z0-9]+)\}/i', $subject, $matches);
+
+        if ($result === false) {
+            throw new InvalidObjectExeption();
+        }
+
+        if (!empty($matches[1])) {
+            foreach ($matches[1] as $parameter) {
+                if (!isset($parameters[$parameter])) {
+                    throw new InvalidObjectExeption('Parameter is undefined');
+                }
+            }
+        }
+
+        foreach ($parameters as $parameter) {
+            if (!\is_array($parameter)) {
+                throw new InvalidObjectExeption('Parameter is malformed');
+            }
+
+            $this->validateParameter($parameter);
+        }
+    }
+
+    /**
+     * @param array $parameter
+     * @throws InvalidObjectExeption
+     */
+    protected function validateParameter(array $parameter) {
+        if (!isset($parameter['type'])) {
+            throw new InvalidObjectExeption('Object type is undefined');
+        }
+
+        $definition = $this->definitions->getDefinition($parameter['type']);
+        $requiredParameters = $this->getRequiredParameters($parameter['type'], $definition);
+
+        $missingKeys = array_diff($requiredParameters, array_keys($parameter));
+        if (!empty($missingKeys)) {
+            throw new InvalidObjectExeption('Object is invalid');
+        }
+    }
+
+    /**
+     * @param string $type
+     * @param array $definition
+     * @return string[]
+     */
+    protected function getRequiredParameters($type, array $definition) {
+        if (isset($this->requiredParameters[$type])) {
+            return $this->requiredParameters[$type];
+        }
+
+        $this->requiredParameters[$type] = [];
+        foreach ($definition['parameters'] as $parameter => $data) {
+            if ($data['required']) {
+                $this->requiredParameters[$type][] = $parameter;
+            }
+        }
+
+        return $this->requiredParameters[$type];
+    }
 }

core/Command/Db/ConvertFilecacheBigInt.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 					$column->setType(Type::getType(Type::BIGINT));
 					$column->setOptions(['length' => 20]);
 
-					$updates[] = '* ' . $tableName . '.' . $columnName;
+					$updates[] = '* '.$tableName.'.'.$columnName;
 				}
 			}
 		}

Indentation +83 added lines, -83 removed lines

@@ -38,87 +38,87 @@
 
 class ConvertFilecacheBigInt extends Command {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/**
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('db:convert-filecache-bigint')
-			->setDescription('Convert the ID columns of the filecache to BigInt');
-	}
-
-	protected function getColumnsByTable() {
-		// also update in CheckSetupController::hasBigIntConversionPendingColumns()
-		return [
-			'activity' => ['activity_id', 'object_id'],
-			'activity_mq' => ['mail_id'],
-			'authtoken' => ['id'],
-			'bruteforce_attempts' => ['id'],
-			'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart', 'mtime', 'storage_mtime'],
-			'file_locks' => ['id'],
-			'jobs' => ['id'],
-			'mimetypes' => ['id'],
-			'mounts' => ['id', 'storage_id', 'root_id', 'mount_id'],
-			'storages' => ['numeric_id'],
-		];
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$schema = new SchemaWrapper($this->connection);
-		$isSqlite = $this->connection->getDatabasePlatform() instanceof SqlitePlatform;
-		$updates = [];
-
-		$tables = $this->getColumnsByTable();
-		foreach ($tables as $tableName => $columns) {
-			if (!$schema->hasTable($tableName)) {
-				continue;
-			}
-
-			$table = $schema->getTable($tableName);
-
-			foreach ($columns as $columnName) {
-				$column = $table->getColumn($columnName);
-				$isAutoIncrement = $column->getAutoincrement();
-				$isAutoIncrementOnSqlite = $isSqlite && $isAutoIncrement;
-				if ($column->getType()->getName() !== Type::BIGINT && !$isAutoIncrementOnSqlite) {
-					$column->setType(Type::getType(Type::BIGINT));
-					$column->setOptions(['length' => 20]);
-
-					$updates[] = '* ' . $tableName . '.' . $columnName;
-				}
-			}
-		}
-
-		if (empty($updates)) {
-			$output->writeln('<info>All tables already up to date!</info>');
-			return 0;
-		}
-
-		$output->writeln('<comment>Following columns will be updated:</comment>');
-		$output->writeln('');
-		$output->writeln($updates);
-		$output->writeln('');
-		$output->writeln('<comment>This can take up to hours, depending on the number of files in your instance!</comment>');
-
-		if ($input->isInteractive()) {
-			$helper = $this->getHelper('question');
-			$question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', false);
-
-			if (!$helper->ask($input, $output, $question)) {
-				return 1;
-			}
-		}
-
-		$this->connection->migrateToSchema($schema->getWrappedSchema());
-
-		return 0;
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /**
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('db:convert-filecache-bigint')
+            ->setDescription('Convert the ID columns of the filecache to BigInt');
+    }
+
+    protected function getColumnsByTable() {
+        // also update in CheckSetupController::hasBigIntConversionPendingColumns()
+        return [
+            'activity' => ['activity_id', 'object_id'],
+            'activity_mq' => ['mail_id'],
+            'authtoken' => ['id'],
+            'bruteforce_attempts' => ['id'],
+            'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart', 'mtime', 'storage_mtime'],
+            'file_locks' => ['id'],
+            'jobs' => ['id'],
+            'mimetypes' => ['id'],
+            'mounts' => ['id', 'storage_id', 'root_id', 'mount_id'],
+            'storages' => ['numeric_id'],
+        ];
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $schema = new SchemaWrapper($this->connection);
+        $isSqlite = $this->connection->getDatabasePlatform() instanceof SqlitePlatform;
+        $updates = [];
+
+        $tables = $this->getColumnsByTable();
+        foreach ($tables as $tableName => $columns) {
+            if (!$schema->hasTable($tableName)) {
+                continue;
+            }
+
+            $table = $schema->getTable($tableName);
+
+            foreach ($columns as $columnName) {
+                $column = $table->getColumn($columnName);
+                $isAutoIncrement = $column->getAutoincrement();
+                $isAutoIncrementOnSqlite = $isSqlite && $isAutoIncrement;
+                if ($column->getType()->getName() !== Type::BIGINT && !$isAutoIncrementOnSqlite) {
+                    $column->setType(Type::getType(Type::BIGINT));
+                    $column->setOptions(['length' => 20]);
+
+                    $updates[] = '* ' . $tableName . '.' . $columnName;
+                }
+            }
+        }
+
+        if (empty($updates)) {
+            $output->writeln('<info>All tables already up to date!</info>');
+            return 0;
+        }
+
+        $output->writeln('<comment>Following columns will be updated:</comment>');
+        $output->writeln('');
+        $output->writeln($updates);
+        $output->writeln('');
+        $output->writeln('<comment>This can take up to hours, depending on the number of files in your instance!</comment>');
+
+        if ($input->isInteractive()) {
+            $helper = $this->getHelper('question');
+            $question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', false);
+
+            if (!$helper->ask($input, $output, $question)) {
+                return 1;
+            }
+        }
+
+        $this->connection->migrateToSchema($schema->getWrappedSchema());
+
+        return 0;
+    }
 }

apps/oauth2/lib/Db/ClientMapper.php

Indentation +52 added lines, -52 removed lines

@@ -30,62 +30,62 @@
 
 class ClientMapper extends QBMapper {
 
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'oauth2_clients');
-	}
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'oauth2_clients');
+    }
 
-	/**
-	 * @param string $clientIdentifier
-	 * @return Client
-	 * @throws ClientNotFoundException
-	 */
-	public function getByIdentifier(string $clientIdentifier): Client {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('client_identifier', $qb->createNamedParameter($clientIdentifier)));
+    /**
+     * @param string $clientIdentifier
+     * @return Client
+     * @throws ClientNotFoundException
+     */
+    public function getByIdentifier(string $clientIdentifier): Client {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('client_identifier', $qb->createNamedParameter($clientIdentifier)));
 
-		try {
-			$client = $this->findEntity($qb);
-		} catch (IMapperException $e) {
-			throw new ClientNotFoundException('could not find client '.$clientIdentifier, 0, $e);
-		}
-		return $client;
-	}
+        try {
+            $client = $this->findEntity($qb);
+        } catch (IMapperException $e) {
+            throw new ClientNotFoundException('could not find client '.$clientIdentifier, 0, $e);
+        }
+        return $client;
+    }
 
-	/**
-	 * @param int $id internal id of the client
-	 * @return Client
-	 * @throws ClientNotFoundException
-	 */
-	public function getByUid(int $id): Client {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+    /**
+     * @param int $id internal id of the client
+     * @return Client
+     * @throws ClientNotFoundException
+     */
+    public function getByUid(int $id): Client {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
 
-		try {
-			$client = $this->findEntity($qb);
-		} catch (IMapperException $e) {
-			throw new ClientNotFoundException('could not find client with id '.$id, 0, $e);
-		}
-		return $client;
-	}
+        try {
+            $client = $this->findEntity($qb);
+        } catch (IMapperException $e) {
+            throw new ClientNotFoundException('could not find client with id '.$id, 0, $e);
+        }
+        return $client;
+    }
 
-	/**
-	 * @return Client[]
-	 */
-	public function getClients(): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName);
+    /**
+     * @return Client[]
+     */
+    public function getClients(): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName);
 
-		return $this->findEntities($qb);
-	}
+        return $this->findEntities($qb);
+    }
 }

apps/oauth2/lib/Db/AccessTokenMapper.php

Indentation +36 added lines, -36 removed lines

@@ -30,44 +30,44 @@
 
 class AccessTokenMapper extends QBMapper {
 
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'oauth2_access_tokens');
-	}
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'oauth2_access_tokens');
+    }
 
-	/**
-	 * @param string $code
-	 * @return AccessToken
-	 * @throws AccessTokenNotFoundException
-	 */
-	public function getByCode(string $code): AccessToken {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('hashed_code', $qb->createNamedParameter(hash('sha512', $code))));
+    /**
+     * @param string $code
+     * @return AccessToken
+     * @throws AccessTokenNotFoundException
+     */
+    public function getByCode(string $code): AccessToken {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('hashed_code', $qb->createNamedParameter(hash('sha512', $code))));
 
-		try {
-			$token = $this->findEntity($qb);
-		} catch (IMapperException $e) {
-			throw new AccessTokenNotFoundException('Could not find access token', 0, $e);
-		}
+        try {
+            $token = $this->findEntity($qb);
+        } catch (IMapperException $e) {
+            throw new AccessTokenNotFoundException('Could not find access token', 0, $e);
+        }
 
-		return $token;
-	}
+        return $token;
+    }
 
-	/**
-	 * delete all access token from a given client
-	 *
-	 * @param int $id
-	 */
-	public function deleteByClientId(int $id) {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->delete($this->tableName)
-			->where($qb->expr()->eq('client_id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-		$qb->execute();
-	}
+    /**
+     * delete all access token from a given client
+     *
+     * @param int $id
+     */
+    public function deleteByClientId(int $id) {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->delete($this->tableName)
+            ->where($qb->expr()->eq('client_id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+        $qb->execute();
+    }
 }

lib/public/L10N/IFactory.php

Indentation +82 added lines, -82 removed lines

@@ -27,95 +27,95 @@
  * @since 8.2.0
  */
 interface IFactory {
-	/**
-	 * Get a language instance
-	 *
-	 * @param string $app
-	 * @param string|null $lang
-	 * @param string|null $locale
-	 * @return \OCP\IL10N
-	 * @since 8.2.0
-	 */
-	public function get($app, $lang = null, $locale = null);
+    /**
+     * Get a language instance
+     *
+     * @param string $app
+     * @param string|null $lang
+     * @param string|null $locale
+     * @return \OCP\IL10N
+     * @since 8.2.0
+     */
+    public function get($app, $lang = null, $locale = null);
 
-	/**
-	 * Find the best language
-	 *
-	 * @param string|null $app App id or null for core
-	 * @return string language If nothing works it returns 'en'
-	 * @since 9.0.0
-	 */
-	public function findLanguage($app = null);
+    /**
+     * Find the best language
+     *
+     * @param string|null $app App id or null for core
+     * @return string language If nothing works it returns 'en'
+     * @since 9.0.0
+     */
+    public function findLanguage($app = null);
 
-	/**
-	 * @param string|null $lang user language as default locale
-	 * @return string locale If nothing works it returns 'en_US'
-	 * @since 14.0.0
-	 */
-	public function findLocale($lang = null);
+    /**
+     * @param string|null $lang user language as default locale
+     * @return string locale If nothing works it returns 'en_US'
+     * @since 14.0.0
+     */
+    public function findLocale($lang = null);
 
-	/**
-	 * find the matching lang from the locale
-	 *
-	 * @param string $app
-	 * @param string $locale
-	 * @return null|string
-	 * @since 14.0.1
-	 */
-	public function findLanguageFromLocale(string $app = 'core', string $locale = null);
+    /**
+     * find the matching lang from the locale
+     *
+     * @param string $app
+     * @param string $locale
+     * @return null|string
+     * @since 14.0.1
+     */
+    public function findLanguageFromLocale(string $app = 'core', string $locale = null);
 
-	/**
-	 * Find all available languages for an app
-	 *
-	 * @param string|null $app App id or null for core
-	 * @return string[] an array of available languages
-	 * @since 9.0.0
-	 */
-	public function findAvailableLanguages($app = null);
+    /**
+     * Find all available languages for an app
+     *
+     * @param string|null $app App id or null for core
+     * @return string[] an array of available languages
+     * @since 9.0.0
+     */
+    public function findAvailableLanguages($app = null);
 
-	/**
-	 * @return array an array of available
-	 * @since 14.0.0
-	 */
-	public function findAvailableLocales();
+    /**
+     * @return array an array of available
+     * @since 14.0.0
+     */
+    public function findAvailableLocales();
 
-	/**
-	 * @param string|null $app App id or null for core
-	 * @param string $lang
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function languageExists($app, $lang);
+    /**
+     * @param string|null $app App id or null for core
+     * @param string $lang
+     * @return bool
+     * @since 9.0.0
+     */
+    public function languageExists($app, $lang);
 
-	/**
-	 * @param string $locale
-	 * @return bool
-	 * @since 14.0.0
-	 */
-	public function localeExists($locale);
+    /**
+     * @param string $locale
+     * @return bool
+     * @since 14.0.0
+     */
+    public function localeExists($locale);
 
-	/**
-	 * Creates a function from the plural string
-	 *
-	 * @param string $string
-	 * @return string Unique function name
-	 * @since 14.0.0
-	 */
-	public function createPluralFunction($string);
+    /**
+     * Creates a function from the plural string
+     *
+     * @param string $string
+     * @return string Unique function name
+     * @since 14.0.0
+     */
+    public function createPluralFunction($string);
 
-	/**
-	 * iterate through language settings (if provided) in this order:
-	 * 1. returns the forced language or:
-	 * 2. if applicable, the trunk of 1 (e.g. "fu" instead of "fu_BAR"
-	 * 3. returns the user language or:
-	 * 4. if applicable, the trunk of 3
-	 * 5. returns the system default language or:
-	 * 6. if applicable, the trunk of 5
-	 * 7+∞. returns 'en'
-	 *
-	 * Hint: in most cases findLanguage() suits you fine
-	 *
-	 * @since 14.0.0
-	 */
-	public function getLanguageIterator(IUser $user = null): ILanguageIterator;
+    /**
+     * iterate through language settings (if provided) in this order:
+     * 1. returns the forced language or:
+     * 2. if applicable, the trunk of 1 (e.g. "fu" instead of "fu_BAR"
+     * 3. returns the user language or:
+     * 4. if applicable, the trunk of 3
+     * 5. returns the system default language or:
+     * 6. if applicable, the trunk of 5
+     * 7+∞. returns 'en'
+     *
+     * Hint: in most cases findLanguage() suits you fine
+     *
+     * @since 14.0.0
+     */
+    public function getLanguageIterator(IUser $user = null): ILanguageIterator;
 }

apps/oauth2/lib/Migration/Version010401Date20181207190718.php

Indentation +62 added lines, -62 removed lines

@@ -31,68 +31,68 @@
 
 class Version010401Date20181207190718 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('oauth2_clients')) {
-			$table = $schema->createTable('oauth2_clients');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'unsigned' => true,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('redirect_uri', 'string', [
-				'notnull' => true,
-				'length' => 2000,
-			]);
-			$table->addColumn('client_identifier', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('secret', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['client_identifier'], 'oauth2_client_id_idx');
-		}
+        if (!$schema->hasTable('oauth2_clients')) {
+            $table = $schema->createTable('oauth2_clients');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('redirect_uri', 'string', [
+                'notnull' => true,
+                'length' => 2000,
+            ]);
+            $table->addColumn('client_identifier', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('secret', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['client_identifier'], 'oauth2_client_id_idx');
+        }
 
-		if (!$schema->hasTable('oauth2_access_tokens')) {
-			$table = $schema->createTable('oauth2_access_tokens');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'unsigned' => true,
-			]);
-			$table->addColumn('token_id', 'integer', [
-				'notnull' => true,
-			]);
-			$table->addColumn('client_id', 'integer', [
-				'notnull' => true,
-			]);
-			$table->addColumn('hashed_code', 'string', [
-				'notnull' => true,
-				'length' => 128,
-			]);
-			$table->addColumn('encrypted_token', 'string', [
-				'notnull' => true,
-				'length' => 786,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['hashed_code'], 'oauth2_access_hash_idx');
-			$table->addIndex(['client_id'], 'oauth2_access_client_id_idx');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('oauth2_access_tokens')) {
+            $table = $schema->createTable('oauth2_access_tokens');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('token_id', 'integer', [
+                'notnull' => true,
+            ]);
+            $table->addColumn('client_id', 'integer', [
+                'notnull' => true,
+            ]);
+            $table->addColumn('hashed_code', 'string', [
+                'notnull' => true,
+                'length' => 128,
+            ]);
+            $table->addColumn('encrypted_token', 'string', [
+                'notnull' => true,
+                'length' => 786,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['hashed_code'], 'oauth2_access_hash_idx');
+            $table->addIndex(['client_id'], 'oauth2_access_client_id_idx');
+        }
+        return $schema;
+    }
 }

lib/private/Files/AppData/AppData.php

Spacing +7 added lines, -7 removed lines

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

Indentation +139 added lines, -139 removed lines

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