nextcloud / server

lib/public/Encryption/Keys/IStorage.php

Indentation +135 added lines, -135 removed lines

@@ -33,151 +33,151 @@
  */
 interface IStorage {
 
-	/**
-	 * get user specific key
-	 *
-	 * @param string $uid ID if the user for whom we want the key
-	 * @param string $keyId id of the key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return mixed key
-	 * @since 8.1.0
-	 */
-	public function getUserKey($uid, $keyId, $encryptionModuleId);
+    /**
+     * get user specific key
+     *
+     * @param string $uid ID if the user for whom we want the key
+     * @param string $keyId id of the key
+     * @param string $encryptionModuleId
+     *
+     * @return mixed key
+     * @since 8.1.0
+     */
+    public function getUserKey($uid, $keyId, $encryptionModuleId);
 
-	/**
-	 * get file specific key
-	 *
-	 * @param string $path path to file
-	 * @param string $keyId id of the key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return mixed key
-	 * @since 8.1.0
-	 */
-	public function getFileKey($path, $keyId, $encryptionModuleId);
+    /**
+     * get file specific key
+     *
+     * @param string $path path to file
+     * @param string $keyId id of the key
+     * @param string $encryptionModuleId
+     *
+     * @return mixed key
+     * @since 8.1.0
+     */
+    public function getFileKey($path, $keyId, $encryptionModuleId);
 
-	/**
-	 * get system-wide encryption keys not related to a specific user,
-	 * e.g something like a key for public link shares
-	 *
-	 * @param string $keyId id of the key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return mixed key
-	 * @since 8.1.0
-	 */
-	public function getSystemUserKey($keyId, $encryptionModuleId);
+    /**
+     * get system-wide encryption keys not related to a specific user,
+     * e.g something like a key for public link shares
+     *
+     * @param string $keyId id of the key
+     * @param string $encryptionModuleId
+     *
+     * @return mixed key
+     * @since 8.1.0
+     */
+    public function getSystemUserKey($keyId, $encryptionModuleId);
 
-	/**
-	 * set user specific key
-	 *
-	 * @param string $uid ID if the user for whom we want the key
-	 * @param string $keyId id of the key
-	 * @param mixed $key
-	 * @param string $encryptionModuleId
-	 * @since 8.1.0
-	 */
-	public function setUserKey($uid, $keyId, $key, $encryptionModuleId);
+    /**
+     * set user specific key
+     *
+     * @param string $uid ID if the user for whom we want the key
+     * @param string $keyId id of the key
+     * @param mixed $key
+     * @param string $encryptionModuleId
+     * @since 8.1.0
+     */
+    public function setUserKey($uid, $keyId, $key, $encryptionModuleId);
 
-	/**
-	 * set file specific key
-	 *
-	 * @param string $path path to file
-	 * @param string $keyId id of the key
-	 * @param mixed $key
-	 * @param string $encryptionModuleId
-	 * @since 8.1.0
-	 */
-	public function setFileKey($path, $keyId, $key, $encryptionModuleId);
+    /**
+     * set file specific key
+     *
+     * @param string $path path to file
+     * @param string $keyId id of the key
+     * @param mixed $key
+     * @param string $encryptionModuleId
+     * @since 8.1.0
+     */
+    public function setFileKey($path, $keyId, $key, $encryptionModuleId);
 
-	/**
-	 * set system-wide encryption keys not related to a specific user,
-	 * e.g something like a key for public link shares
-	 *
-	 * @param string $keyId id of the key
-	 * @param mixed $key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return mixed key
-	 * @since 8.1.0
-	 */
-	public function setSystemUserKey($keyId, $key, $encryptionModuleId);
+    /**
+     * set system-wide encryption keys not related to a specific user,
+     * e.g something like a key for public link shares
+     *
+     * @param string $keyId id of the key
+     * @param mixed $key
+     * @param string $encryptionModuleId
+     *
+     * @return mixed key
+     * @since 8.1.0
+     */
+    public function setSystemUserKey($keyId, $key, $encryptionModuleId);
 
-	/**
-	 * delete user specific key
-	 *
-	 * @param string $uid ID if the user for whom we want to delete the key
-	 * @param string $keyId id of the key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return boolean False when the key could not be deleted
-	 * @since 8.1.0
-	 */
-	public function deleteUserKey($uid, $keyId, $encryptionModuleId);
+    /**
+     * delete user specific key
+     *
+     * @param string $uid ID if the user for whom we want to delete the key
+     * @param string $keyId id of the key
+     * @param string $encryptionModuleId
+     *
+     * @return boolean False when the key could not be deleted
+     * @since 8.1.0
+     */
+    public function deleteUserKey($uid, $keyId, $encryptionModuleId);
 
-	/**
-	 * delete file specific key
-	 *
-	 * @param string $path path to file
-	 * @param string $keyId id of the key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return boolean False when the key could not be deleted
-	 * @since 8.1.0
-	 */
-	public function deleteFileKey($path, $keyId, $encryptionModuleId);
+    /**
+     * delete file specific key
+     *
+     * @param string $path path to file
+     * @param string $keyId id of the key
+     * @param string $encryptionModuleId
+     *
+     * @return boolean False when the key could not be deleted
+     * @since 8.1.0
+     */
+    public function deleteFileKey($path, $keyId, $encryptionModuleId);
 
-	/**
-	 * delete all file keys for a given file
-	 *
-	 * @param string $path to the file
-	 *
-	 * @return boolean False when the keys could not be deleted
-	 * @since 8.1.0
-	 */
-	public function deleteAllFileKeys($path);
+    /**
+     * delete all file keys for a given file
+     *
+     * @param string $path to the file
+     *
+     * @return boolean False when the keys could not be deleted
+     * @since 8.1.0
+     */
+    public function deleteAllFileKeys($path);
 
-	/**
-	 * delete system-wide encryption keys not related to a specific user,
-	 * e.g something like a key for public link shares
-	 *
-	 * @param string $keyId id of the key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return boolean False when the key could not be deleted
-	 * @since 8.1.0
-	 */
-	public function deleteSystemUserKey($keyId, $encryptionModuleId);
+    /**
+     * delete system-wide encryption keys not related to a specific user,
+     * e.g something like a key for public link shares
+     *
+     * @param string $keyId id of the key
+     * @param string $encryptionModuleId
+     *
+     * @return boolean False when the key could not be deleted
+     * @since 8.1.0
+     */
+    public function deleteSystemUserKey($keyId, $encryptionModuleId);
 
-	/**
-	 * copy keys if a file was renamed
-	 *
-	 * @param string $source
-	 * @param string $target
-	 * @return boolean
-	 * @since 8.1.0
-	 */
-	public function renameKeys($source, $target);
+    /**
+     * copy keys if a file was renamed
+     *
+     * @param string $source
+     * @param string $target
+     * @return boolean
+     * @since 8.1.0
+     */
+    public function renameKeys($source, $target);
 
-	/**
-	 * move keys if a file was renamed
-	 *
-	 * @param string $source
-	 * @param string $target
-	 * @return boolean
-	 * @since 8.1.0
-	 */
-	public function copyKeys($source, $target);
+    /**
+     * move keys if a file was renamed
+     *
+     * @param string $source
+     * @param string $target
+     * @return boolean
+     * @since 8.1.0
+     */
+    public function copyKeys($source, $target);
 
-	/**
-	 * backup keys of a given encryption module
-	 *
-	 * @param string $encryptionModuleId
-	 * @param string $purpose
-	 * @param string $uid
-	 * @return bool
-	 * @since 12.0.0
-	 */
-	public function backupUserKeys($encryptionModuleId, $purpose, $uid);
+    /**
+     * backup keys of a given encryption module
+     *
+     * @param string $encryptionModuleId
+     * @param string $purpose
+     * @param string $uid
+     * @return bool
+     * @since 12.0.0
+     */
+    public function backupUserKeys($encryptionModuleId, $purpose, $uid);
 }

lib/private/Authentication/LoginCredentials/Credentials.php

Indentation +34 added lines, -34 removed lines

@@ -28,45 +28,45 @@
 
 class Credentials implements ICredentials {
 
-	/** @var string */
-	private $uid;
+    /** @var string */
+    private $uid;
 
-	/** @var string */
-	private $loginName;
+    /** @var string */
+    private $loginName;
 
-	/** @var string */
-	private $password;
+    /** @var string */
+    private $password;
 
-	/**
-	 * @param string $uid
-	 * @param string $loginName
-	 * @param string $password
-	 */
-	public function __construct($uid, $loginName, $password) {
-		$this->uid = $uid;
-		$this->loginName = $loginName;
-		$this->password = $password;
-	}
+    /**
+     * @param string $uid
+     * @param string $loginName
+     * @param string $password
+     */
+    public function __construct($uid, $loginName, $password) {
+        $this->uid = $uid;
+        $this->loginName = $loginName;
+        $this->password = $password;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getUID() {
-		return $this->uid;
-	}
+    /**
+     * @return string
+     */
+    public function getUID() {
+        return $this->uid;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getLoginName() {
-		return $this->loginName;
-	}
+    /**
+     * @return string
+     */
+    public function getLoginName() {
+        return $this->loginName;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getPassword() {
-		return $this->password;
-	}
+    /**
+     * @return string
+     */
+    public function getPassword() {
+        return $this->password;
+    }
 
 }

lib/private/Authentication/Token/DefaultTokenMapper.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 		$data = $result->fetchAll();
 		$result->closeCursor();
 
-		$entities = array_map(function ($row) {
+		$entities = array_map(function($row) {
 			return DefaultToken::fromRow($row);
 		}, $data);
 

Indentation +131 added lines, -131 removed lines

@@ -36,135 +36,135 @@
 use OCP\IDBConnection;
 
 class DefaultTokenMapper extends QBMapper {
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'authtoken');
-	}
-
-	/**
-	 * Invalidate (delete) a given token
-	 *
-	 * @param string $token
-	 */
-	public function invalidate(string $token) {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('authtoken')
-			->where($qb->expr()->eq('token', $qb->createNamedParameter($token, IQueryBuilder::PARAM_STR)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
-	}
-
-	/**
-	 * @param int $olderThan
-	 * @param int $remember
-	 */
-	public function invalidateOld(int $olderThan, int $remember = IToken::DO_NOT_REMEMBER) {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('authtoken')
-			->where($qb->expr()->lt('last_activity', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->eq('remember', $qb->createNamedParameter($remember, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
-	}
-
-	/**
-	 * Get the user UID for the given token
-	 *
-	 * @param string $token
-	 * @throws DoesNotExistException
-	 * @return DefaultToken
-	 */
-	public function getToken(string $token): DefaultToken {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$result = $qb->select('id', 'uid', 'login_name', 'password', 'name', 'token', 'type', 'remember', 'last_activity', 'last_check', 'scope', 'expires', 'version')
-			->from('authtoken')
-			->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
-
-		$data = $result->fetch();
-		$result->closeCursor();
-		if ($data === false) {
-			throw new DoesNotExistException('token does not exist');
-		}
-		return DefaultToken::fromRow($data);
-	}
-
-	/**
-	 * Get the token for $id
-	 *
-	 * @param int $id
-	 * @throws DoesNotExistException
-	 * @return DefaultToken
-	 */
-	public function getTokenById(int $id): DefaultToken {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$result = $qb->select('id', 'uid', 'login_name', 'password', 'name', 'token', 'type', 'remember', 'last_activity', 'last_check', 'scope', 'expires', 'version')
-			->from('authtoken')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
-
-		$data = $result->fetch();
-		$result->closeCursor();
-		if ($data === false) {
-			throw new DoesNotExistException('token does not exist');
-		}
-		return DefaultToken::fromRow($data);
-	}
-
-	/**
-	 * Get all tokens of a user
-	 *
-	 * The provider may limit the number of result rows in case of an abuse
-	 * where a high number of (session) tokens is generated
-	 *
-	 * @param string $uid
-	 * @return DefaultToken[]
-	 */
-	public function getTokenByUser(string $uid): array {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('id', 'uid', 'login_name', 'password', 'name', 'token', 'type', 'remember', 'last_activity', 'last_check', 'scope', 'expires', 'version')
-			->from('authtoken')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->setMaxResults(1000);
-		$result = $qb->execute();
-		$data = $result->fetchAll();
-		$result->closeCursor();
-
-		$entities = array_map(function ($row) {
-			return DefaultToken::fromRow($row);
-		}, $data);
-
-		return $entities;
-	}
-
-	public function deleteById(string $uid, int $id) {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('authtoken')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)));
-		$qb->execute();
-	}
-
-	/**
-	 * delete all auth token which belong to a specific client if the client was deleted
-	 *
-	 * @param string $name
-	 */
-	public function deleteByName(string $name) {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('authtoken')
-			->where($qb->expr()->eq('name', $qb->createNamedParameter($name), IQueryBuilder::PARAM_STR))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)));
-		$qb->execute();
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'authtoken');
+    }
+
+    /**
+     * Invalidate (delete) a given token
+     *
+     * @param string $token
+     */
+    public function invalidate(string $token) {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('authtoken')
+            ->where($qb->expr()->eq('token', $qb->createNamedParameter($token, IQueryBuilder::PARAM_STR)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->execute();
+    }
+
+    /**
+     * @param int $olderThan
+     * @param int $remember
+     */
+    public function invalidateOld(int $olderThan, int $remember = IToken::DO_NOT_REMEMBER) {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('authtoken')
+            ->where($qb->expr()->lt('last_activity', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)))
+            ->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN, IQueryBuilder::PARAM_INT)))
+            ->andWhere($qb->expr()->eq('remember', $qb->createNamedParameter($remember, IQueryBuilder::PARAM_INT)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->execute();
+    }
+
+    /**
+     * Get the user UID for the given token
+     *
+     * @param string $token
+     * @throws DoesNotExistException
+     * @return DefaultToken
+     */
+    public function getToken(string $token): DefaultToken {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $result = $qb->select('id', 'uid', 'login_name', 'password', 'name', 'token', 'type', 'remember', 'last_activity', 'last_check', 'scope', 'expires', 'version')
+            ->from('authtoken')
+            ->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->execute();
+
+        $data = $result->fetch();
+        $result->closeCursor();
+        if ($data === false) {
+            throw new DoesNotExistException('token does not exist');
+        }
+        return DefaultToken::fromRow($data);
+    }
+
+    /**
+     * Get the token for $id
+     *
+     * @param int $id
+     * @throws DoesNotExistException
+     * @return DefaultToken
+     */
+    public function getTokenById(int $id): DefaultToken {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $result = $qb->select('id', 'uid', 'login_name', 'password', 'name', 'token', 'type', 'remember', 'last_activity', 'last_check', 'scope', 'expires', 'version')
+            ->from('authtoken')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->execute();
+
+        $data = $result->fetch();
+        $result->closeCursor();
+        if ($data === false) {
+            throw new DoesNotExistException('token does not exist');
+        }
+        return DefaultToken::fromRow($data);
+    }
+
+    /**
+     * Get all tokens of a user
+     *
+     * The provider may limit the number of result rows in case of an abuse
+     * where a high number of (session) tokens is generated
+     *
+     * @param string $uid
+     * @return DefaultToken[]
+     */
+    public function getTokenByUser(string $uid): array {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('id', 'uid', 'login_name', 'password', 'name', 'token', 'type', 'remember', 'last_activity', 'last_check', 'scope', 'expires', 'version')
+            ->from('authtoken')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->setMaxResults(1000);
+        $result = $qb->execute();
+        $data = $result->fetchAll();
+        $result->closeCursor();
+
+        $entities = array_map(function ($row) {
+            return DefaultToken::fromRow($row);
+        }, $data);
+
+        return $entities;
+    }
+
+    public function deleteById(string $uid, int $id) {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('authtoken')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)));
+        $qb->execute();
+    }
+
+    /**
+     * delete all auth token which belong to a specific client if the client was deleted
+     *
+     * @param string $name
+     */
+    public function deleteByName(string $name) {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('authtoken')
+            ->where($qb->expr()->eq('name', $qb->createNamedParameter($name), IQueryBuilder::PARAM_STR))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(DefaultToken::VERSION, IQueryBuilder::PARAM_INT)));
+        $qb->execute();
+    }
 }

lib/private/Console/TimestampFormatter.php

Spacing +1 added lines, -1 removed lines

@@ -103,6 +103,6 @@
 		$time = new \DateTime('now', $timeZone);
 		$timestampInfo = $time->format($this->config->getSystemValue('logdateformat', \DateTime::ATOM));
 
-		return $timestampInfo . ' ' . $this->formatter->format($message);
+		return $timestampInfo.' '.$this->formatter->format($message);
 	}
 }

Indentation +70 added lines, -70 removed lines

@@ -28,84 +28,84 @@
 use Symfony\Component\Console\Formatter\OutputFormatterStyleInterface;
 
 class TimestampFormatter implements OutputFormatterInterface {
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var OutputFormatterInterface */
-	protected $formatter;
+    /** @var OutputFormatterInterface */
+    protected $formatter;
 
-	/**
-	 * @param IConfig $config
-	 * @param OutputFormatterInterface $formatter
-	 */
-	public function __construct(IConfig $config, OutputFormatterInterface $formatter) {
-		$this->config = $config;
-		$this->formatter = $formatter;
-	}
+    /**
+     * @param IConfig $config
+     * @param OutputFormatterInterface $formatter
+     */
+    public function __construct(IConfig $config, OutputFormatterInterface $formatter) {
+        $this->config = $config;
+        $this->formatter = $formatter;
+    }
 
-	/**
-	 * Sets the decorated flag.
-	 *
-	 * @param bool $decorated Whether to decorate the messages or not
-	 */
-	public function setDecorated($decorated) {
-		$this->formatter->setDecorated($decorated);
-	}
+    /**
+     * Sets the decorated flag.
+     *
+     * @param bool $decorated Whether to decorate the messages or not
+     */
+    public function setDecorated($decorated) {
+        $this->formatter->setDecorated($decorated);
+    }
 
-	/**
-	 * Gets the decorated flag.
-	 *
-	 * @return bool true if the output will decorate messages, false otherwise
-	 */
-	public function isDecorated() {
-		return $this->formatter->isDecorated();
-	}
+    /**
+     * Gets the decorated flag.
+     *
+     * @return bool true if the output will decorate messages, false otherwise
+     */
+    public function isDecorated() {
+        return $this->formatter->isDecorated();
+    }
 
-	/**
-	 * Sets a new style.
-	 *
-	 * @param string $name The style name
-	 * @param OutputFormatterStyleInterface $style The style instance
-	 */
-	public function setStyle($name, OutputFormatterStyleInterface $style) {
-		$this->formatter->setStyle($name, $style);
-	}
+    /**
+     * Sets a new style.
+     *
+     * @param string $name The style name
+     * @param OutputFormatterStyleInterface $style The style instance
+     */
+    public function setStyle($name, OutputFormatterStyleInterface $style) {
+        $this->formatter->setStyle($name, $style);
+    }
 
-	/**
-	 * Checks if output formatter has style with specified name.
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function hasStyle($name) {
-		return $this->formatter->hasStyle($name);
-	}
+    /**
+     * Checks if output formatter has style with specified name.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasStyle($name) {
+        return $this->formatter->hasStyle($name);
+    }
 
-	/**
-	 * Gets style options from style with specified name.
-	 *
-	 * @param string $name
-	 * @return OutputFormatterStyleInterface
-	 * @throws \InvalidArgumentException When style isn't defined
-	 */
-	public function getStyle($name) {
-		return $this->formatter->getStyle($name);
-	}
+    /**
+     * Gets style options from style with specified name.
+     *
+     * @param string $name
+     * @return OutputFormatterStyleInterface
+     * @throws \InvalidArgumentException When style isn't defined
+     */
+    public function getStyle($name) {
+        return $this->formatter->getStyle($name);
+    }
 
-	/**
-	 * Formats a message according to the given styles.
-	 *
-	 * @param string $message The message to style
-	 * @return string The styled message, prepended with a timestamp using the
-	 * log timezone and dateformat, e.g. "2015-06-23T17:24:37+02:00"
-	 */
-	public function format($message) {
-		$timeZone = $this->config->getSystemValue('logtimezone', 'UTC');
-		$timeZone = $timeZone !== null ? new \DateTimeZone($timeZone) : null;
+    /**
+     * Formats a message according to the given styles.
+     *
+     * @param string $message The message to style
+     * @return string The styled message, prepended with a timestamp using the
+     * log timezone and dateformat, e.g. "2015-06-23T17:24:37+02:00"
+     */
+    public function format($message) {
+        $timeZone = $this->config->getSystemValue('logtimezone', 'UTC');
+        $timeZone = $timeZone !== null ? new \DateTimeZone($timeZone) : null;
 
-		$time = new \DateTime('now', $timeZone);
-		$timestampInfo = $time->format($this->config->getSystemValue('logdateformat', \DateTime::ATOM));
+        $time = new \DateTime('now', $timeZone);
+        $timestampInfo = $time->format($this->config->getSystemValue('logdateformat', \DateTime::ATOM));
 
-		return $timestampInfo . ' ' . $this->formatter->format($message);
-	}
+        return $timestampInfo . ' ' . $this->formatter->format($message);
+    }
 }

lib/private/Http/Client/Response.php

Spacing +1 added lines, -2 removed lines

@@ -54,8 +54,7 @@
 	 */
 	public function getBody() {
 		return $this->stream ?
-			$this->response->getBody()->detach():
-			$this->response->getBody()->getContents();
+			$this->response->getBody()->detach() : $this->response->getBody()->getContents();
 	}
 
 	/**

Indentation +45 added lines, -45 removed lines

@@ -33,57 +33,57 @@
  * @package OC\Http
  */
 class Response implements IResponse {
-	/** @var ResponseInterface */
-	private $response;
+    /** @var ResponseInterface */
+    private $response;
 
-	/**
-	 * @var bool
-	 */
-	private $stream;
+    /**
+     * @var bool
+     */
+    private $stream;
 
-	/**
-	 * @param ResponseInterface $response
-	 * @param bool $stream
-	 */
-	public function __construct(ResponseInterface $response, $stream = false) {
-		$this->response = $response;
-		$this->stream = $stream;
-	}
+    /**
+     * @param ResponseInterface $response
+     * @param bool $stream
+     */
+    public function __construct(ResponseInterface $response, $stream = false) {
+        $this->response = $response;
+        $this->stream = $stream;
+    }
 
-	/**
-	 * @return string|resource
-	 */
-	public function getBody() {
-		return $this->stream ?
-			$this->response->getBody()->detach():
-			$this->response->getBody()->getContents();
-	}
+    /**
+     * @return string|resource
+     */
+    public function getBody() {
+        return $this->stream ?
+            $this->response->getBody()->detach():
+            $this->response->getBody()->getContents();
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getStatusCode(): int {
-		return $this->response->getStatusCode();
-	}
+    /**
+     * @return int
+     */
+    public function getStatusCode(): int {
+        return $this->response->getStatusCode();
+    }
 
-	/**
-	 * @param string $key
-	 * @return string
-	 */
-	public function getHeader(string $key): string {
-		$headers = $this->response->getHeader($key);
+    /**
+     * @param string $key
+     * @return string
+     */
+    public function getHeader(string $key): string {
+        $headers = $this->response->getHeader($key);
 
-		if (count($headers) === 0) {
-			return '';
-		}
+        if (count($headers) === 0) {
+            return '';
+        }
 
-		return $headers[0];
-	}
+        return $headers[0];
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getHeaders(): array {
-		return $this->response->getHeaders();
-	}
+    /**
+     * @return array
+     */
+    public function getHeaders(): array {
+        return $this->response->getHeaders();
+    }
 }

lib/private/HintException.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 * @return string
 	 */
 	public function __toString() {
-		return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
+		return __CLASS__.": [{$this->code}]: {$this->message} ({$this->hint})\n";
 	}
 
 	/**

Indentation +39 added lines, -39 removed lines

@@ -34,46 +34,46 @@
  * @package OC
  */
 class HintException extends \Exception {
-	private $hint;
+    private $hint;
 
-	/**
-	 * HintException constructor.
-	 *
-	 * @param string $message  The error message. It will be not revealed to the
-	 *                         the user (unless the hint is empty) and thus
-	 *                         should be not translated.
-	 * @param string $hint     A useful message that is presented to the end
-	 *                         user. It should be translated, but must not
-	 *                         contain sensitive data.
-	 * @param int $code
-	 * @param \Exception|null $previous
-	 */
-	public function __construct($message, $hint = '', $code = 0, \Exception $previous = null) {
-		$this->hint = $hint;
-		parent::__construct($message, $code, $previous);
-	}
+    /**
+     * HintException constructor.
+     *
+     * @param string $message  The error message. It will be not revealed to the
+     *                         the user (unless the hint is empty) and thus
+     *                         should be not translated.
+     * @param string $hint     A useful message that is presented to the end
+     *                         user. It should be translated, but must not
+     *                         contain sensitive data.
+     * @param int $code
+     * @param \Exception|null $previous
+     */
+    public function __construct($message, $hint = '', $code = 0, \Exception $previous = null) {
+        $this->hint = $hint;
+        parent::__construct($message, $code, $previous);
+    }
 
-	/**
-	 * Returns a string representation of this Exception that includes the error
-	 * code, the message and the hint.
-	 *
-	 * @return string
-	 */
-	public function __toString() {
-		return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
-	}
+    /**
+     * Returns a string representation of this Exception that includes the error
+     * code, the message and the hint.
+     *
+     * @return string
+     */
+    public function __toString() {
+        return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
+    }
 
-	/**
-	 * Returns the hint with the intention to be presented to the end user. If
-	 * an empty hint was specified upon instatiation, the message is returned
-	 * instead.
-	 *
-	 * @return string
-	 */
-	public function getHint() {
-		if (empty($this->hint)) {
-			return $this->message;
-		}
-		return $this->hint;
-	}
+    /**
+     * Returns the hint with the intention to be presented to the end user. If
+     * an empty hint was specified upon instatiation, the message is returned
+     * instead.
+     *
+     * @return string
+     */
+    public function getHint() {
+        if (empty($this->hint)) {
+            return $this->message;
+        }
+        return $this->hint;
+    }
 }

lib/private/Diagnostics/Event.php

Indentation +65 added lines, -65 removed lines

@@ -26,79 +26,79 @@
 use OCP\Diagnostics\IEvent;
 
 class Event implements IEvent {
-	/**
-	 * @var string
-	 */
-	protected $id;
+    /**
+     * @var string
+     */
+    protected $id;
 
-	/**
-	 * @var float
-	 */
-	protected $start;
+    /**
+     * @var float
+     */
+    protected $start;
 
-	/**
-	 * @var float
-	 */
-	protected $end;
+    /**
+     * @var float
+     */
+    protected $end;
 
-	/**
-	 * @var string
-	 */
-	protected $description;
+    /**
+     * @var string
+     */
+    protected $description;
 
-	/**
-	 * @param string $id
-	 * @param string $description
-	 * @param float $start
-	 */
-	public function __construct($id, $description, $start) {
-		$this->id = $id;
-		$this->description = $description;
-		$this->start = $start;
-	}
+    /**
+     * @param string $id
+     * @param string $description
+     * @param float $start
+     */
+    public function __construct($id, $description, $start) {
+        $this->id = $id;
+        $this->description = $description;
+        $this->start = $start;
+    }
 
-	/**
-	 * @param float $time
-	 */
-	public function end($time) {
-		$this->end = $time;
-	}
+    /**
+     * @param float $time
+     */
+    public function end($time) {
+        $this->end = $time;
+    }
 
-	/**
-	 * @return float
-	 */
-	public function getStart() {
-		return $this->start;
-	}
+    /**
+     * @return float
+     */
+    public function getStart() {
+        return $this->start;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getId() {
-		return $this->id;
-	}
+    /**
+     * @return string
+     */
+    public function getId() {
+        return $this->id;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getDescription() {
-		return $this->description;
-	}
+    /**
+     * @return string
+     */
+    public function getDescription() {
+        return $this->description;
+    }
 
-	/**
-	 * @return float
-	 */
-	public function getEnd() {
-		return $this->end;
-	}
+    /**
+     * @return float
+     */
+    public function getEnd() {
+        return $this->end;
+    }
 
-	/**
-	 * @return float
-	 */
-	public function getDuration() {
-		if (!$this->end) {
-			$this->end = microtime(true);
-		}
-		return $this->end - $this->start;
-	}
+    /**
+     * @return float
+     */
+    public function getDuration() {
+        if (!$this->end) {
+            $this->end = microtime(true);
+        }
+        return $this->end - $this->start;
+    }
 }

lib/private/NaturalSort_DefaultCollator.php

Indentation +10 added lines, -10 removed lines

@@ -25,14 +25,14 @@
 namespace OC;
 
 class NaturalSort_DefaultCollator {
-	public function compare($a, $b) {
-		$result = strcasecmp($a, $b);
-		if ($result === 0) {
-			if ($a === $b) {
-				return 0;
-			}
-			return ($a > $b) ? -1 : 1;
-		}
-		return ($result < 0) ? -1 : 1;
-	}
+    public function compare($a, $b) {
+        $result = strcasecmp($a, $b);
+        if ($result === 0) {
+            if ($a === $b) {
+                return 0;
+            }
+            return ($a > $b) ? -1 : 1;
+        }
+        return ($result < 0) ? -1 : 1;
+    }
 }

lib/private/Migration/BackgroundRepair.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 	 */
 	public function execute($jobList, ILogger $logger = null) {
 		// add an interval of 15 mins
-		$this->setInterval(15*60);
+		$this->setInterval(15 * 60);
 
 		$this->jobList = $jobList;
 		$this->logger = $logger;
@@ -90,7 +90,7 @@ 
 		try {
 			$repair->addStep($step);
 		} catch (\Exception $ex) {
-			$this->logger->logException($ex,[
+			$this->logger->logException($ex, [
 				'app' => 'migration'
 			]);
 

Indentation +78 added lines, -78 removed lines

@@ -39,82 +39,82 @@
  */
 class BackgroundRepair extends TimedJob {
 
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	public function __construct(EventDispatcherInterface $dispatcher) {
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * run the job, then remove it from the job list
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		// add an interval of 15 mins
-		$this->setInterval(15*60);
-
-		$this->jobList = $jobList;
-		$this->logger = $logger;
-		parent::execute($jobList, $logger);
-	}
-
-	/**
-	 * @param array $argument
-	 * @throws \Exception
-	 * @throws \OC\NeedsUpdateException
-	 */
-	protected function run($argument) {
-		if (!isset($argument['app']) || !isset($argument['step'])) {
-			// remove the job - we can never execute it
-			$this->jobList->remove($this, $this->argument);
-			return;
-		}
-		$app = $argument['app'];
-
-		try {
-			$this->loadApp($app);
-		} catch (NeedsUpdateException $ex) {
-			// as long as the app is not yet done with it's offline migration
-			// we better not start with the live migration
-			return;
-		}
-
-		$step = $argument['step'];
-		$repair = new Repair([], $this->dispatcher);
-		try {
-			$repair->addStep($step);
-		} catch (\Exception $ex) {
-			$this->logger->logException($ex,[
-				'app' => 'migration'
-			]);
-
-			// remove the job - we can never execute it
-			$this->jobList->remove($this, $this->argument);
-			return;
-		}
-
-		// execute the repair step
-		$repair->run();
-
-		// remove the job once executed successfully
-		$this->jobList->remove($this, $this->argument);
-	}
-
-	/**
-	 * @codeCoverageIgnore
-	 * @param $app
-	 * @throws NeedsUpdateException
-	 */
-	protected function loadApp($app) {
-		OC_App::loadApp($app);
-	}
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    public function __construct(EventDispatcherInterface $dispatcher) {
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * run the job, then remove it from the job list
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        // add an interval of 15 mins
+        $this->setInterval(15*60);
+
+        $this->jobList = $jobList;
+        $this->logger = $logger;
+        parent::execute($jobList, $logger);
+    }
+
+    /**
+     * @param array $argument
+     * @throws \Exception
+     * @throws \OC\NeedsUpdateException
+     */
+    protected function run($argument) {
+        if (!isset($argument['app']) || !isset($argument['step'])) {
+            // remove the job - we can never execute it
+            $this->jobList->remove($this, $this->argument);
+            return;
+        }
+        $app = $argument['app'];
+
+        try {
+            $this->loadApp($app);
+        } catch (NeedsUpdateException $ex) {
+            // as long as the app is not yet done with it's offline migration
+            // we better not start with the live migration
+            return;
+        }
+
+        $step = $argument['step'];
+        $repair = new Repair([], $this->dispatcher);
+        try {
+            $repair->addStep($step);
+        } catch (\Exception $ex) {
+            $this->logger->logException($ex,[
+                'app' => 'migration'
+            ]);
+
+            // remove the job - we can never execute it
+            $this->jobList->remove($this, $this->argument);
+            return;
+        }
+
+        // execute the repair step
+        $repair->run();
+
+        // remove the job once executed successfully
+        $this->jobList->remove($this, $this->argument);
+    }
+
+    /**
+     * @codeCoverageIgnore
+     * @param $app
+     * @throws NeedsUpdateException
+     */
+    protected function loadApp($app) {
+        OC_App::loadApp($app);
+    }
 }