nextcloud / server

lib/public/Log/RotationTrait.php

Indentation +32 added lines, -32 removed lines

@@ -32,40 +32,40 @@
  */
 trait RotationTrait {
 
-	/**
-	 * @var string
-	 * @since 14.0.0
-	 */
-	protected $filePath;
+    /**
+     * @var string
+     * @since 14.0.0
+     */
+    protected $filePath;
 
-	/**
-	 * @var int
-	 * @since 14.0.0
-	 */
-	protected $maxSize;
+    /**
+     * @var int
+     * @since 14.0.0
+     */
+    protected $maxSize;
 
-	/**
-	 * @return string the resulting new filepath
-	 * @since 14.0.0
-	 */
-	protected function rotate():string {
-		$rotatedFile = $this->filePath.'.1';
-		rename($this->filePath, $rotatedFile);
-		return $rotatedFile;
-	}
+    /**
+     * @return string the resulting new filepath
+     * @since 14.0.0
+     */
+    protected function rotate():string {
+        $rotatedFile = $this->filePath.'.1';
+        rename($this->filePath, $rotatedFile);
+        return $rotatedFile;
+    }
 
-	/**
-	 * @return bool
-	 * @since 14.0.0
-	 */
-	protected function shouldRotateBySize():bool {
-		if ((int)$this->maxSize > 0) {
-			$filesize = @filesize($this->filePath);
-			if ($filesize >= (int)$this->maxSize) {
-				return true;
-			}
-		}
-		return false;
-	}
+    /**
+     * @return bool
+     * @since 14.0.0
+     */
+    protected function shouldRotateBySize():bool {
+        if ((int)$this->maxSize > 0) {
+            $filesize = @filesize($this->filePath);
+            if ($filesize >= (int)$this->maxSize) {
+                return true;
+            }
+        }
+        return false;
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -59,9 +59,9 @@
 	 * @since 14.0.0
 	 */
 	protected function shouldRotateBySize():bool {
-		if ((int)$this->maxSize > 0) {
+		if ((int) $this->maxSize > 0) {
 			$filesize = @filesize($this->filePath);
-			if ($filesize >= (int)$this->maxSize) {
+			if ($filesize >= (int) $this->maxSize) {
 				return true;
 			}
 		}

ocm-provider/index.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  */
 
 
-require_once __DIR__ . '/../lib/base.php';
+require_once __DIR__.'/../lib/base.php';
 
 header('Content-Type: application/json');
 

Indentation +7 added lines, -7 removed lines

@@ -29,12 +29,12 @@
 $isEnabled = $server->getAppManager()->isEnabledForUser('cloud_federation_api');
 
 if ($isEnabled) {
-	// Make sure the routes are loaded
-	\OC_App::loadApp('cloud_federation_api');
-	$capabilities = new OCA\CloudFederationAPI\Capabilities($server->getURLGenerator());
-	header('Content-Type: application/json');
-	echo json_encode($capabilities->getCapabilities()['ocm']);
+    // Make sure the routes are loaded
+    \OC_App::loadApp('cloud_federation_api');
+    $capabilities = new OCA\CloudFederationAPI\Capabilities($server->getURLGenerator());
+    header('Content-Type: application/json');
+    echo json_encode($capabilities->getCapabilities()['ocm']);
 } else {
-	header($_SERVER["SERVER_PROTOCOL"]." 501 Not Implemented", true, 501);
-	exit("501 Not Implemented");
+    header($_SERVER["SERVER_PROTOCOL"]." 501 Not Implemented", true, 501);
+    exit("501 Not Implemented");
 }

lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	 */
 	public function __construct($providerId) {
 		$l = \OC::$server->getL10N('federation');
-		$message = 'Cloud Federation Provider with ID: "' . $providerId . '" does not exist.';
+		$message = 'Cloud Federation Provider with ID: "'.$providerId.'" does not exist.';
 		$hint = $l->t('Cloud Federation Provider with ID: "%s" does not exist.', [$providerId]);
 		parent::__construct($message, $hint);
 	}

Indentation +13 added lines, -13 removed lines

@@ -32,18 +32,18 @@
  */
 class ProviderDoesNotExistsException extends HintException {
 
-	/**
-	 * ProviderDoesNotExistsException constructor.
-	 *
-	 * @since 14.0.0
-	 *
-	 * @param string $providerId cloud federation provider ID
-	 */
-	public function __construct($providerId) {
-		$l = \OC::$server->getL10N('federation');
-		$message = 'Cloud Federation Provider with ID: "' . $providerId . '" does not exist.';
-		$hint = $l->t('Cloud Federation Provider with ID: "%s" does not exist.', [$providerId]);
-		parent::__construct($message, $hint);
-	}
+    /**
+     * ProviderDoesNotExistsException constructor.
+     *
+     * @since 14.0.0
+     *
+     * @param string $providerId cloud federation provider ID
+     */
+    public function __construct($providerId) {
+        $l = \OC::$server->getL10N('federation');
+        $message = 'Cloud Federation Provider with ID: "' . $providerId . '" does not exist.';
+        $hint = $l->t('Cloud Federation Provider with ID: "%s" does not exist.', [$providerId]);
+        parent::__construct($message, $hint);
+    }
 
 }

core/Command/Db/Migrations/GenerateCommand.php

Spacing +5 added lines, -5 removed lines

@@ -113,7 +113,7 @@ 
 		$appName = $input->getArgument('app');
 		$version = $input->getArgument('version');
 
-		if (!preg_match('/^\d{1,16}$/',$version)) {
+		if (!preg_match('/^\d{1,16}$/', $version)) {
 			$output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>');
 			return 1;
 		}
@@ -121,7 +121,7 @@ 
 		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
 
 		$date = date('YmdHis');
-		$path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date);
+		$path = $this->generateMigration($ms, 'Version'.$version.'Date'.$date);
 
 		$output->writeln("New migration class has been generated to <info>$path</info>");
 		return 0;
@@ -151,7 +151,7 @@ 
 			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
 
 			$version = explode('.', $this->appManager->getAppVersion($appName));
-			return [$version[0] . sprintf('%1$03d', $version[1])];
+			return [$version[0].sprintf('%1$03d', $version[1])];
 		}
 
 		return [];
@@ -165,7 +165,7 @@ 
 	 */
 	protected function generateMigration(MigrationService $ms, $className, $schemaBody = '') {
 		if ($schemaBody === '') {
-			$schemaBody = "\t\t" . 'return null;';
+			$schemaBody = "\t\t".'return null;';
 		}
 
 
@@ -183,7 +183,7 @@ 
 		$dir = $ms->getMigrationsDirectory();
 
 		$this->ensureMigrationDirExists($dir);
-		$path = $dir . '/' . $className . '.php';
+		$path = $dir.'/'.$className.'.php';
 
 		if (file_put_contents($path, $code) === false) {
 			throw new RuntimeException('Failed to generate new migration step.');

Indentation +127 added lines, -127 removed lines

@@ -38,8 +38,8 @@ 
 use Symfony\Component\Console\Output\OutputInterface;
 
 class GenerateCommand extends Command implements CompletionAwareInterface {
-	protected static $_templateSimple =
-		'<?php
+    protected static $_templateSimple =
+        '<?php
 
 declare(strict_types=1);
 
@@ -83,129 +83,129 @@ 
 }
 ';
 
-	/** @var Connection */
-	protected $connection;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	/**
-	 * @param Connection $connection
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(Connection $connection, IAppManager $appManager) {
-		$this->connection = $connection;
-		$this->appManager = $appManager;
-
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('migrations:generate')
-			->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on')
-			->addArgument('version', InputArgument::REQUIRED, 'Major version of this app, to allow versions on parallel development branches')
-		;
-
-		parent::configure();
-	}
-
-	public function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$version = $input->getArgument('version');
-
-		if (!preg_match('/^\d{1,16}$/',$version)) {
-			$output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>');
-			return 1;
-		}
-
-		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
-
-		$date = date('YmdHis');
-		$path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date);
-
-		$output->writeln("New migration class has been generated to <info>$path</info>");
-		return 0;
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			$allApps = \OC_App::getAllApps();
-			return array_diff($allApps, \OC_App::getEnabledApps(true, true));
-		}
-
-		if ($argumentName === 'version') {
-			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
-
-			$version = explode('.', $this->appManager->getAppVersion($appName));
-			return [$version[0] . sprintf('%1$03d', $version[1])];
-		}
-
-		return [];
-	}
-
-	/**
-	 * @param MigrationService $ms
-	 * @param string $className
-	 * @param string $schemaBody
-	 * @return string
-	 */
-	protected function generateMigration(MigrationService $ms, $className, $schemaBody = '') {
-		if ($schemaBody === '') {
-			$schemaBody = "\t\t" . 'return null;';
-		}
-
-
-		$placeHolders = [
-			'{{namespace}}',
-			'{{classname}}',
-			'{{schemabody}}',
-		];
-		$replacements = [
-			$ms->getMigrationsNamespace(),
-			$className,
-			$schemaBody,
-		];
-		$code = str_replace($placeHolders, $replacements, self::$_templateSimple);
-		$dir = $ms->getMigrationsDirectory();
-
-		$this->ensureMigrationDirExists($dir);
-		$path = $dir . '/' . $className . '.php';
-
-		if (file_put_contents($path, $code) === false) {
-			throw new RuntimeException('Failed to generate new migration step.');
-		}
-
-		return $path;
-	}
-
-	protected function ensureMigrationDirExists($directory) {
-		if (file_exists($directory) && is_dir($directory)) {
-			return;
-		}
-
-		if (file_exists($directory)) {
-			throw new \RuntimeException("Could not create folder \"$directory\"");
-		}
-
-		$this->ensureMigrationDirExists(dirname($directory));
-
-		if (!@mkdir($directory) && !is_dir($directory)) {
-			throw new \RuntimeException("Could not create folder \"$directory\"");
-		}
-	}
+    /** @var Connection */
+    protected $connection;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    /**
+     * @param Connection $connection
+     * @param IAppManager $appManager
+     */
+    public function __construct(Connection $connection, IAppManager $appManager) {
+        $this->connection = $connection;
+        $this->appManager = $appManager;
+
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('migrations:generate')
+            ->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on')
+            ->addArgument('version', InputArgument::REQUIRED, 'Major version of this app, to allow versions on parallel development branches')
+        ;
+
+        parent::configure();
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $version = $input->getArgument('version');
+
+        if (!preg_match('/^\d{1,16}$/',$version)) {
+            $output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>');
+            return 1;
+        }
+
+        $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
+
+        $date = date('YmdHis');
+        $path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date);
+
+        $output->writeln("New migration class has been generated to <info>$path</info>");
+        return 0;
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            $allApps = \OC_App::getAllApps();
+            return array_diff($allApps, \OC_App::getEnabledApps(true, true));
+        }
+
+        if ($argumentName === 'version') {
+            $appName = $context->getWordAtIndex($context->getWordIndex() - 1);
+
+            $version = explode('.', $this->appManager->getAppVersion($appName));
+            return [$version[0] . sprintf('%1$03d', $version[1])];
+        }
+
+        return [];
+    }
+
+    /**
+     * @param MigrationService $ms
+     * @param string $className
+     * @param string $schemaBody
+     * @return string
+     */
+    protected function generateMigration(MigrationService $ms, $className, $schemaBody = '') {
+        if ($schemaBody === '') {
+            $schemaBody = "\t\t" . 'return null;';
+        }
+
+
+        $placeHolders = [
+            '{{namespace}}',
+            '{{classname}}',
+            '{{schemabody}}',
+        ];
+        $replacements = [
+            $ms->getMigrationsNamespace(),
+            $className,
+            $schemaBody,
+        ];
+        $code = str_replace($placeHolders, $replacements, self::$_templateSimple);
+        $dir = $ms->getMigrationsDirectory();
+
+        $this->ensureMigrationDirExists($dir);
+        $path = $dir . '/' . $className . '.php';
+
+        if (file_put_contents($path, $code) === false) {
+            throw new RuntimeException('Failed to generate new migration step.');
+        }
+
+        return $path;
+    }
+
+    protected function ensureMigrationDirExists($directory) {
+        if (file_exists($directory) && is_dir($directory)) {
+            return;
+        }
+
+        if (file_exists($directory)) {
+            throw new \RuntimeException("Could not create folder \"$directory\"");
+        }
+
+        $this->ensureMigrationDirExists(dirname($directory));
+
+        if (!@mkdir($directory) && !is_dir($directory)) {
+            throw new \RuntimeException("Could not create folder \"$directory\"");
+        }
+    }
 }

lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php

Indentation +11 added lines, -11 removed lines

@@ -30,19 +30,19 @@
 
 class AddPreviewBackgroundCleanupJob implements IRepairStep {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IJobList $jobList) {
-		$this->jobList = $jobList;
-	}
+    public function __construct(IJobList $jobList) {
+        $this->jobList = $jobList;
+    }
 
-	public function getName(): string {
-		return 'Add preview background cleanup job';
-	}
+    public function getName(): string {
+        return 'Add preview background cleanup job';
+    }
 
-	public function run(IOutput $output) {
-		$this->jobList->add(BackgroundCleanupJob::class);
-	}
+    public function run(IOutput $output) {
+        $this->jobList->add(BackgroundCleanupJob::class);
+    }
 
 }

lib/public/Federation/Exceptions/ActionNotSupportedException.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	 */
 	public function __construct($action) {
 		$l = \OC::$server->getL10N('federation');
-		$message = 'Action "' . $action . '" not supported or implemented.';
+		$message = 'Action "'.$action.'" not supported or implemented.';
 		$hint = $l->t('Action "%s" not supported or implemented.', [$action]);
 		parent::__construct($message, $hint);
 	}

Indentation +12 added lines, -12 removed lines

@@ -32,17 +32,17 @@
  */
 class ActionNotSupportedException extends HintException {
 
-	/**
-	 * ActionNotSupportedException constructor.
-	 *
-	 * @since 14.0.0
-	 *
-	 */
-	public function __construct($action) {
-		$l = \OC::$server->getL10N('federation');
-		$message = 'Action "' . $action . '" not supported or implemented.';
-		$hint = $l->t('Action "%s" not supported or implemented.', [$action]);
-		parent::__construct($message, $hint);
-	}
+    /**
+     * ActionNotSupportedException constructor.
+     *
+     * @since 14.0.0
+     *
+     */
+    public function __construct($action) {
+        $l = \OC::$server->getL10N('federation');
+        $message = 'Action "' . $action . '" not supported or implemented.';
+        $hint = $l->t('Action "%s" not supported or implemented.', [$action]);
+        parent::__construct($message, $hint);
+    }
 
 }

lib/private/Preview/Watcher.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		}
 
 		try {
-			$folder = $this->appData->getFolder((string)$node->getId());
+			$folder = $this->appData->getFolder((string) $node->getId());
 			$folder->delete();
 		} catch (NotFoundException $e) {
 			//Nothing to do

Indentation +30 added lines, -30 removed lines

@@ -36,39 +36,39 @@
  * Class that will watch filesystem activity and remove previews as needed.
  */
 class Watcher {
-	/** @var IAppData */
-	private $appData;
+    /** @var IAppData */
+    private $appData;
 
-	/**
-	 * Watcher constructor.
-	 *
-	 * @param IAppData $appData
-	 */
-	public function __construct(IAppData $appData) {
-		$this->appData = $appData;
-	}
+    /**
+     * Watcher constructor.
+     *
+     * @param IAppData $appData
+     */
+    public function __construct(IAppData $appData) {
+        $this->appData = $appData;
+    }
 
-	public function postWrite(Node $node) {
-		$this->deleteNode($node);
-	}
+    public function postWrite(Node $node) {
+        $this->deleteNode($node);
+    }
 
-	protected function deleteNode(Node $node) {
-		// We only handle files
-		if ($node instanceof Folder) {
-			return;
-		}
+    protected function deleteNode(Node $node) {
+        // We only handle files
+        if ($node instanceof Folder) {
+            return;
+        }
 
-		try {
-			$folder = $this->appData->getFolder((string)$node->getId());
-			$folder->delete();
-		} catch (NotFoundException $e) {
-			//Nothing to do
-		}
-	}
+        try {
+            $folder = $this->appData->getFolder((string)$node->getId());
+            $folder->delete();
+        } catch (NotFoundException $e) {
+            //Nothing to do
+        }
+    }
 
-	public function versionRollback(array $data) {
-		if (isset($data['node'])) {
-			$this->deleteNode($data['node']);
-		}
-	}
+    public function versionRollback(array $data) {
+        if (isset($data['node'])) {
+            $this->deleteNode($data['node']);
+        }
+    }
 }

lib/private/Preview/WatcherConnector.php

Indentation +30 added lines, -30 removed lines

@@ -29,39 +29,39 @@
 
 class WatcherConnector {
 
-	/** @var IRootFolder */
-	private $root;
+    /** @var IRootFolder */
+    private $root;
 
-	/** @var SystemConfig */
-	private $config;
+    /** @var SystemConfig */
+    private $config;
 
-	/**
-	 * WatcherConnector constructor.
-	 *
-	 * @param IRootFolder $root
-	 * @param SystemConfig $config
-	 */
-	public function __construct(IRootFolder $root,
-								SystemConfig $config) {
-		$this->root = $root;
-		$this->config = $config;
-	}
+    /**
+     * WatcherConnector constructor.
+     *
+     * @param IRootFolder $root
+     * @param SystemConfig $config
+     */
+    public function __construct(IRootFolder $root,
+                                SystemConfig $config) {
+        $this->root = $root;
+        $this->config = $config;
+    }
 
-	/**
-	 * @return Watcher
-	 */
-	private function getWatcher(): Watcher {
-		return \OC::$server->query(Watcher::class);
-	}
+    /**
+     * @return Watcher
+     */
+    private function getWatcher(): Watcher {
+        return \OC::$server->query(Watcher::class);
+    }
 
-	public function connectWatcher() {
-		// Do not connect if we are not setup yet!
-		if ($this->config->getValue('instanceid', null) !== null) {
-			$this->root->listen('\OC\Files', 'postWrite', function (Node $node) {
-				$this->getWatcher()->postWrite($node);
-			});
+    public function connectWatcher() {
+        // Do not connect if we are not setup yet!
+        if ($this->config->getValue('instanceid', null) !== null) {
+            $this->root->listen('\OC\Files', 'postWrite', function (Node $node) {
+                $this->getWatcher()->postWrite($node);
+            });
 
-			\OC_Hook::connect('\OCP\Versions', 'rollback', $this->getWatcher(), 'versionRollback');
-		}
-	}
+            \OC_Hook::connect('\OCP\Versions', 'rollback', $this->getWatcher(), 'versionRollback');
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 	public function connectWatcher() {
 		// Do not connect if we are not setup yet!
 		if ($this->config->getValue('instanceid', null) !== null) {
-			$this->root->listen('\OC\Files', 'postWrite', function (Node $node) {
+			$this->root->listen('\OC\Files', 'postWrite', function(Node $node) {
 				$this->getWatcher()->postWrite($node);
 			});
 

lib/private/Authentication/Token/DefaultToken.php

Spacing +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
 		if (\is_array($scope)) {
 			parent::setScope(json_encode($scope));
 		} else {
-			parent::setScope((string)$scope);
+			parent::setScope((string) $scope);
 		}
 	}
 

Indentation +164 added lines, -164 removed lines

@@ -43,168 +43,168 @@
  * @method void setVersion(int $version)
  */
 class DefaultToken extends Entity implements INamedToken {
-	public const VERSION = 1;
-
-	/** @var string user UID */
-	protected $uid;
-
-	/** @var string login name used for generating the token */
-	protected $loginName;
-
-	/** @var string encrypted user password */
-	protected $password;
-
-	/** @var string token name (e.g. browser/OS) */
-	protected $name;
-
-	/** @var string */
-	protected $token;
-
-	/** @var int */
-	protected $type;
-
-	/** @var int */
-	protected $remember;
-
-	/** @var int */
-	protected $lastActivity;
-
-	/** @var int */
-	protected $lastCheck;
-
-	/** @var string */
-	protected $scope;
-
-	/** @var int */
-	protected $expires;
-
-	/** @var int */
-	protected $version;
-
-	public function __construct() {
-		$this->addType('uid', 'string');
-		$this->addType('loginName', 'string');
-		$this->addType('password', 'string');
-		$this->addType('name', 'string');
-		$this->addType('token', 'string');
-		$this->addType('type', 'int');
-		$this->addType('remember', 'int');
-		$this->addType('lastActivity', 'int');
-		$this->addType('lastCheck', 'int');
-		$this->addType('scope', 'string');
-		$this->addType('expires', 'int');
-		$this->addType('version', 'int');
-	}
-
-	public function getId(): int {
-		return $this->id;
-	}
-
-	public function getUID(): string {
-		return $this->uid;
-	}
-
-	/**
-	 * Get the login name used when generating the token
-	 *
-	 * @return string
-	 */
-	public function getLoginName(): string {
-		return parent::getLoginName();
-	}
-
-	/**
-	 * Get the (encrypted) login password
-	 *
-	 * @return string|null
-	 */
-	public function getPassword() {
-		return parent::getPassword();
-	}
-
-	public function jsonSerialize() {
-		return [
-			'id' => $this->id,
-			'name' => $this->name,
-			'lastActivity' => $this->lastActivity,
-			'type' => $this->type,
-			'scope' => $this->getScopeAsArray()
-		];
-	}
-
-	/**
-	 * Get the timestamp of the last password check
-	 *
-	 * @return int
-	 */
-	public function getLastCheck(): int {
-		return parent::getLastCheck();
-	}
-
-	/**
-	 * Get the timestamp of the last password check
-	 *
-	 * @param int $time
-	 */
-	public function setLastCheck(int $time) {
-		parent::setLastCheck($time);
-	}
-
-	public function getScope(): string {
-		$scope = parent::getScope();
-		if ($scope === null) {
-			return '';
-		}
-
-		return $scope;
-	}
-
-	public function getScopeAsArray(): array {
-		$scope = json_decode($this->getScope(), true);
-		if (!$scope) {
-			return [
-				'filesystem' => true
-			];
-		}
-		return $scope;
-	}
-
-	public function setScope($scope) {
-		if (\is_array($scope)) {
-			parent::setScope(json_encode($scope));
-		} else {
-			parent::setScope((string)$scope);
-		}
-	}
-
-	public function getName(): string {
-		return parent::getName();
-	}
-
-	public function setName(string $name): void {
-		parent::setName($name);
-	}
-
-	public function getRemember(): int {
-		return parent::getRemember();
-	}
-
-	public function setToken(string $token) {
-		parent::setToken($token);
-	}
-
-	public function setPassword(string $password = null) {
-		parent::setPassword($password);
-	}
-
-	public function setExpires($expires) {
-		parent::setExpires($expires);
-	}
-
-	/**
-	 * @return int|null
-	 */
-	public function getExpires() {
-		return parent::getExpires();
-	}
+    public const VERSION = 1;
+
+    /** @var string user UID */
+    protected $uid;
+
+    /** @var string login name used for generating the token */
+    protected $loginName;
+
+    /** @var string encrypted user password */
+    protected $password;
+
+    /** @var string token name (e.g. browser/OS) */
+    protected $name;
+
+    /** @var string */
+    protected $token;
+
+    /** @var int */
+    protected $type;
+
+    /** @var int */
+    protected $remember;
+
+    /** @var int */
+    protected $lastActivity;
+
+    /** @var int */
+    protected $lastCheck;
+
+    /** @var string */
+    protected $scope;
+
+    /** @var int */
+    protected $expires;
+
+    /** @var int */
+    protected $version;
+
+    public function __construct() {
+        $this->addType('uid', 'string');
+        $this->addType('loginName', 'string');
+        $this->addType('password', 'string');
+        $this->addType('name', 'string');
+        $this->addType('token', 'string');
+        $this->addType('type', 'int');
+        $this->addType('remember', 'int');
+        $this->addType('lastActivity', 'int');
+        $this->addType('lastCheck', 'int');
+        $this->addType('scope', 'string');
+        $this->addType('expires', 'int');
+        $this->addType('version', 'int');
+    }
+
+    public function getId(): int {
+        return $this->id;
+    }
+
+    public function getUID(): string {
+        return $this->uid;
+    }
+
+    /**
+     * Get the login name used when generating the token
+     *
+     * @return string
+     */
+    public function getLoginName(): string {
+        return parent::getLoginName();
+    }
+
+    /**
+     * Get the (encrypted) login password
+     *
+     * @return string|null
+     */
+    public function getPassword() {
+        return parent::getPassword();
+    }
+
+    public function jsonSerialize() {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'lastActivity' => $this->lastActivity,
+            'type' => $this->type,
+            'scope' => $this->getScopeAsArray()
+        ];
+    }
+
+    /**
+     * Get the timestamp of the last password check
+     *
+     * @return int
+     */
+    public function getLastCheck(): int {
+        return parent::getLastCheck();
+    }
+
+    /**
+     * Get the timestamp of the last password check
+     *
+     * @param int $time
+     */
+    public function setLastCheck(int $time) {
+        parent::setLastCheck($time);
+    }
+
+    public function getScope(): string {
+        $scope = parent::getScope();
+        if ($scope === null) {
+            return '';
+        }
+
+        return $scope;
+    }
+
+    public function getScopeAsArray(): array {
+        $scope = json_decode($this->getScope(), true);
+        if (!$scope) {
+            return [
+                'filesystem' => true
+            ];
+        }
+        return $scope;
+    }
+
+    public function setScope($scope) {
+        if (\is_array($scope)) {
+            parent::setScope(json_encode($scope));
+        } else {
+            parent::setScope((string)$scope);
+        }
+    }
+
+    public function getName(): string {
+        return parent::getName();
+    }
+
+    public function setName(string $name): void {
+        parent::setName($name);
+    }
+
+    public function getRemember(): int {
+        return parent::getRemember();
+    }
+
+    public function setToken(string $token) {
+        parent::setToken($token);
+    }
+
+    public function setPassword(string $password = null) {
+        parent::setPassword($password);
+    }
+
+    public function setExpires($expires) {
+        parent::setExpires($expires);
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getExpires() {
+        return parent::getExpires();
+    }
 }