nextcloud / server

apps/dav/lib/Migration/Version1008Date20181105112049.php

Indentation +13 added lines, -13 removed lines

@@ -32,18 +32,18 @@
 
 class Version1008Date20181105112049 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();
-		$table = $schema->getTable('calendarsubscriptions');
-		$table->dropColumn('source_copy');
+    /**
+     * @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();
+        $table = $schema->getTable('calendarsubscriptions');
+        $table->dropColumn('source_copy');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/dav/lib/Migration/Version1008Date20181105104833.php

Indentation +13 added lines, -13 removed lines

@@ -32,18 +32,18 @@
 
 class Version1008Date20181105104833 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();
-		$table = $schema->getTable('calendarsubscriptions');
-		$table->dropColumn('source');
+    /**
+     * @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();
+        $table = $schema->getTable('calendarsubscriptions');
+        $table->dropColumn('source');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/public/Security/ICrypto.php

Indentation +25 added lines, -25 removed lines

@@ -37,31 +37,31 @@
  */
 interface ICrypto {
 
-	/**
-	 * @param string $message The message to authenticate
-	 * @param string $password Password to use (defaults to `secret` in config.php)
-	 * @return string Calculated HMAC
-	 * @since 8.0.0
-	 */
-	public function calculateHMAC(string $message, string $password = ''): string;
+    /**
+     * @param string $message The message to authenticate
+     * @param string $password Password to use (defaults to `secret` in config.php)
+     * @return string Calculated HMAC
+     * @since 8.0.0
+     */
+    public function calculateHMAC(string $message, string $password = ''): string;
 
-	/**
-	 * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
-	 * @param string $plaintext
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
-	 * @return string Authenticated ciphertext
-	 * @since 8.0.0
-	 */
-	public function encrypt(string $plaintext, string $password = ''): string;
+    /**
+     * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
+     * @param string $plaintext
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
+     * @return string Authenticated ciphertext
+     * @since 8.0.0
+     */
+    public function encrypt(string $plaintext, string $password = ''): string;
 
-	/**
-	 * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
-	 * @param string $authenticatedCiphertext
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
-	 * @return string plaintext
-	 * @throws \Exception If the HMAC does not match
-	 * @throws \Exception If the decryption failed
-	 * @since 8.0.0
-	 */
-	public function decrypt(string $authenticatedCiphertext, string $password = ''): string;
+    /**
+     * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
+     * @param string $authenticatedCiphertext
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
+     * @return string plaintext
+     * @throws \Exception If the HMAC does not match
+     * @throws \Exception If the decryption failed
+     * @since 8.0.0
+     */
+    public function decrypt(string $authenticatedCiphertext, string $password = ''): string;
 }

apps/dav/lib/Migration/Version1008Date20181114084440.php

Indentation +23 added lines, -23 removed lines

@@ -33,27 +33,27 @@
 class Version1008Date20181114084440 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();
-
-		if ($schema->hasTable('calendarchanges')) {
-			$calendarChangesTable = $schema->getTable('calendarchanges');
-			if ($calendarChangesTable->hasIndex('calendarid_calendartype_synctoken')) {
-				$calendarChangesTable->dropIndex('calendarid_calendartype_synctoken');
-			}
-
-			if (!$calendarChangesTable->hasIndex('calid_type_synctoken')) {
-				$calendarChangesTable->addIndex(['calendarid', 'calendartype', 'synctoken'], 'calid_type_synctoken');
-			}
-		}
-
-		return $schema;
-	}
+    /**
+     * @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('calendarchanges')) {
+            $calendarChangesTable = $schema->getTable('calendarchanges');
+            if ($calendarChangesTable->hasIndex('calendarid_calendartype_synctoken')) {
+                $calendarChangesTable->dropIndex('calendarid_calendartype_synctoken');
+            }
+
+            if (!$calendarChangesTable->hasIndex('calid_type_synctoken')) {
+                $calendarChangesTable->addIndex(['calendarid', 'calendartype', 'synctoken'], 'calid_type_synctoken');
+            }
+        }
+
+        return $schema;
+    }
 }

apps/files_versions/lib/Sabre/VersionHome.php

Indentation +75 added lines, -75 removed lines

@@ -32,79 +32,79 @@
 
 class VersionHome implements ICollection {
 
-	/** @var array */
-	private $principalInfo;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IVersionManager */
-	private $versionManager;
-
-	public function __construct(array $principalInfo, IRootFolder $rootFolder, IUserManager $userManager, IVersionManager $versionManager) {
-		$this->principalInfo = $principalInfo;
-		$this->rootFolder = $rootFolder;
-		$this->userManager = $userManager;
-		$this->versionManager = $versionManager;
-	}
-
-	private function getUser() {
-		list(, $name) = \Sabre\Uri\split($this->principalInfo['uri']);
-		$user = $this->userManager->get($name);
-		if (!$user) {
-			throw new NoUserException();
-		}
-		return $user;
-	}
-
-	public function delete() {
-		throw new Forbidden();
-	}
-
-	public function getName(): string {
-		return $this->getUser()->getUID();
-	}
-
-	public function setName($name) {
-		throw new Forbidden();
-	}
-
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
-
-	public function getChild($name) {
-		$user = $this->getUser();
-
-		if ($name === 'versions') {
-			return new VersionRoot($user, $this->rootFolder, $this->versionManager);
-		}
-		if ($name === 'restore') {
-			return new RestoreFolder();
-		}
-	}
-
-	public function getChildren() {
-		$user = $this->getUser();
-
-		return [
-			new VersionRoot($user, $this->rootFolder, $this->versionManager),
-			new RestoreFolder(),
-		];
-	}
-
-	public function childExists($name) {
-		return $name === 'versions' || $name === 'restore';
-	}
-
-	public function getLastModified() {
-		return 0;
-	}
+    /** @var array */
+    private $principalInfo;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IVersionManager */
+    private $versionManager;
+
+    public function __construct(array $principalInfo, IRootFolder $rootFolder, IUserManager $userManager, IVersionManager $versionManager) {
+        $this->principalInfo = $principalInfo;
+        $this->rootFolder = $rootFolder;
+        $this->userManager = $userManager;
+        $this->versionManager = $versionManager;
+    }
+
+    private function getUser() {
+        list(, $name) = \Sabre\Uri\split($this->principalInfo['uri']);
+        $user = $this->userManager->get($name);
+        if (!$user) {
+            throw new NoUserException();
+        }
+        return $user;
+    }
+
+    public function delete() {
+        throw new Forbidden();
+    }
+
+    public function getName(): string {
+        return $this->getUser()->getUID();
+    }
+
+    public function setName($name) {
+        throw new Forbidden();
+    }
+
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
+
+    public function getChild($name) {
+        $user = $this->getUser();
+
+        if ($name === 'versions') {
+            return new VersionRoot($user, $this->rootFolder, $this->versionManager);
+        }
+        if ($name === 'restore') {
+            return new RestoreFolder();
+        }
+    }
+
+    public function getChildren() {
+        $user = $this->getUser();
+
+        return [
+            new VersionRoot($user, $this->rootFolder, $this->versionManager),
+            new RestoreFolder(),
+        ];
+    }
+
+    public function childExists($name) {
+        return $name === 'versions' || $name === 'restore';
+    }
+
+    public function getLastModified() {
+        return 0;
+    }
 }

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];
+    }
 }

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