Passed
Push — master ( 0571fd...48a8f0 )
by Blizzz
19:19 queued 08:57
created
lib/public/Federation/Exceptions/ProviderCouldNotAddShareException.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -33,19 +33,19 @@
 block discarded – undo
33 33
  */
34 34
 class ProviderCouldNotAddShareException extends HintException {
35 35
 
36
-	/**
37
-	 * ProviderCouldNotAddShareException constructor.
38
-	 *
39
-	 * @since 14.0.0
40
-	 *
41
-	 * @param string $message
42
-	 * @param string $hint
43
-	 * @param int $code
44
-	 * @param \Exception|null $previous
45
-	 */
46
-	public function __construct($message, $hint = '', $code = Http::STATUS_BAD_REQUEST, \Exception $previous = null) {
47
-		parent::__construct($message, $hint, $code, $previous);
48
-	}
36
+    /**
37
+     * ProviderCouldNotAddShareException constructor.
38
+     *
39
+     * @since 14.0.0
40
+     *
41
+     * @param string $message
42
+     * @param string $hint
43
+     * @param int $code
44
+     * @param \Exception|null $previous
45
+     */
46
+    public function __construct($message, $hint = '', $code = Http::STATUS_BAD_REQUEST, \Exception $previous = null) {
47
+        parent::__construct($message, $hint, $code, $previous);
48
+    }
49 49
 
50 50
 
51 51
 }
Please login to merge, or discard this patch.
lib/public/Federation/ICloudFederationFactory.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -30,33 +30,33 @@
 block discarded – undo
30 30
  */
31 31
 interface ICloudFederationFactory {
32 32
 
33
-	/**
34
-	 * get a CloudFederationShare Object to prepare a share you want to send
35
-	 *
36
-	 * @param string $shareWith
37
-	 * @param string $name resource name (e.g. document.odt)
38
-	 * @param string $description share description (optional)
39
-	 * @param string $providerId resource UID on the provider side
40
-	 * @param string $owner provider specific UID of the user who owns the resource
41
-	 * @param string $ownerDisplayName display name of the user who shared the item
42
-	 * @param string $sharedBy provider specific UID of the user who shared the resource
43
-	 * @param string $sharedByDisplayName display name of the user who shared the resource
44
-	 * @param string $sharedSecret used to authenticate requests across servers
45
-	 * @param string $shareType ('group' or 'user' share)
46
-	 * @param $resourceType ('file', 'calendar',...)
47
-	 * @return ICloudFederationShare
48
-	 *
49
-	 * @since 14.0.0
50
-	 */
51
-	public function getCloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $sharedSecret, $shareType, $resourceType);
33
+    /**
34
+     * get a CloudFederationShare Object to prepare a share you want to send
35
+     *
36
+     * @param string $shareWith
37
+     * @param string $name resource name (e.g. document.odt)
38
+     * @param string $description share description (optional)
39
+     * @param string $providerId resource UID on the provider side
40
+     * @param string $owner provider specific UID of the user who owns the resource
41
+     * @param string $ownerDisplayName display name of the user who shared the item
42
+     * @param string $sharedBy provider specific UID of the user who shared the resource
43
+     * @param string $sharedByDisplayName display name of the user who shared the resource
44
+     * @param string $sharedSecret used to authenticate requests across servers
45
+     * @param string $shareType ('group' or 'user' share)
46
+     * @param $resourceType ('file', 'calendar',...)
47
+     * @return ICloudFederationShare
48
+     *
49
+     * @since 14.0.0
50
+     */
51
+    public function getCloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $sharedSecret, $shareType, $resourceType);
52 52
 
53
-	/**
54
-	 * get a Cloud FederationNotification object to prepare a notification you
55
-	 * want to send
56
-	 *
57
-	 * @return ICloudFederationNotification
58
-	 *
59
-	 * @since 14.0.0
60
-	 */
61
-	public function getCloudFederationNotification();
53
+    /**
54
+     * get a Cloud FederationNotification object to prepare a notification you
55
+     * want to send
56
+     *
57
+     * @return ICloudFederationNotification
58
+     *
59
+     * @since 14.0.0
60
+     */
61
+    public function getCloudFederationNotification();
62 62
 }
Please login to merge, or discard this patch.
lib/public/Federation/Exceptions/AuthenticationFailedException.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -32,17 +32,17 @@
 block discarded – undo
32 32
  */
33 33
 class AuthenticationFailedException extends HintException {
34 34
 
35
-	/**
36
-	 * BadRequestException constructor.
37
-	 *
38
-	 * @since 14.0.0
39
-	 *
40
-	 */
41
-	public function __construct() {
42
-		$l = \OC::$server->getL10N('federation');
43
-		$message = 'Authentication failed, wrong token or provider ID given';
44
-		$hint = $l->t('Authentication failed, wrong token or provider ID given');
45
-		parent::__construct($message, $hint);
46
-	}
35
+    /**
36
+     * BadRequestException constructor.
37
+     *
38
+     * @since 14.0.0
39
+     *
40
+     */
41
+    public function __construct() {
42
+        $l = \OC::$server->getL10N('federation');
43
+        $message = 'Authentication failed, wrong token or provider ID given';
44
+        $hint = $l->t('Authentication failed, wrong token or provider ID given');
45
+        parent::__construct($message, $hint);
46
+    }
47 47
 
48 48
 }
Please login to merge, or discard this patch.
core/templates/publicshareauth.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2
-	/** @var $_ array */
3
-	/** @var $l \OCP\IL10N */
4
-	style('core', 'guest');
5
-	style('core', 'publicshareauth');
6
-	script('core', 'publicshareauth');
2
+    /** @var $_ array */
3
+    /** @var $l \OCP\IL10N */
4
+    style('core', 'guest');
5
+    style('core', 'publicshareauth');
6
+    script('core', 'publicshareauth');
7 7
 ?>
8 8
 <form method="post">
9 9
 	<fieldset class="warning">
Please login to merge, or discard this patch.
lib/public/ISession.php 1 patch
Indentation   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -45,69 +45,69 @@
 block discarded – undo
45 45
  */
46 46
 interface ISession {
47 47
 
48
-	/**
49
-	 * Set a value in the session
50
-	 *
51
-	 * @param string $key
52
-	 * @param mixed $value
53
-	 * @since 6.0.0
54
-	 */
55
-	public function set(string $key, $value);
48
+    /**
49
+     * Set a value in the session
50
+     *
51
+     * @param string $key
52
+     * @param mixed $value
53
+     * @since 6.0.0
54
+     */
55
+    public function set(string $key, $value);
56 56
 
57
-	/**
58
-	 * Get a value from the session
59
-	 *
60
-	 * @param string $key
61
-	 * @return mixed should return null if $key does not exist
62
-	 * @since 6.0.0
63
-	 */
64
-	public function get(string $key);
57
+    /**
58
+     * Get a value from the session
59
+     *
60
+     * @param string $key
61
+     * @return mixed should return null if $key does not exist
62
+     * @since 6.0.0
63
+     */
64
+    public function get(string $key);
65 65
 
66
-	/**
67
-	 * Check if a named key exists in the session
68
-	 *
69
-	 * @param string $key
70
-	 * @return bool
71
-	 * @since 6.0.0
72
-	 */
73
-	public function exists(string $key): bool;
66
+    /**
67
+     * Check if a named key exists in the session
68
+     *
69
+     * @param string $key
70
+     * @return bool
71
+     * @since 6.0.0
72
+     */
73
+    public function exists(string $key): bool;
74 74
 
75
-	/**
76
-	 * Remove a $key/$value pair from the session
77
-	 *
78
-	 * @param string $key
79
-	 * @since 6.0.0
80
-	 */
81
-	public function remove(string $key);
75
+    /**
76
+     * Remove a $key/$value pair from the session
77
+     *
78
+     * @param string $key
79
+     * @since 6.0.0
80
+     */
81
+    public function remove(string $key);
82 82
 
83
-	/**
84
-	 * Reset and recreate the session
85
-	 * @since 6.0.0
86
-	 */
87
-	public function clear();
83
+    /**
84
+     * Reset and recreate the session
85
+     * @since 6.0.0
86
+     */
87
+    public function clear();
88 88
 
89
-	/**
90
-	 * Close the session and release the lock
91
-	 * @since 7.0.0
92
-	 */
93
-	public function close();
89
+    /**
90
+     * Close the session and release the lock
91
+     * @since 7.0.0
92
+     */
93
+    public function close();
94 94
 
95
-	/**
96
-	 * Wrapper around session_regenerate_id
97
-	 *
98
-	 * @param bool $deleteOldSession Whether to delete the old associated session file or not.
99
-	 * @param bool $updateToken Wheater to update the associated auth token
100
-	 * @return void
101
-	 * @since 9.0.0, $updateToken added in 14.0.0
102
-	 */
103
-	public function regenerateId(bool $deleteOldSession = true, bool $updateToken = false);
95
+    /**
96
+     * Wrapper around session_regenerate_id
97
+     *
98
+     * @param bool $deleteOldSession Whether to delete the old associated session file or not.
99
+     * @param bool $updateToken Wheater to update the associated auth token
100
+     * @return void
101
+     * @since 9.0.0, $updateToken added in 14.0.0
102
+     */
103
+    public function regenerateId(bool $deleteOldSession = true, bool $updateToken = false);
104 104
 
105
-	/**
106
-	 * Wrapper around session_id
107
-	 *
108
-	 * @return string
109
-	 * @throws SessionNotAvailableException
110
-	 * @since 9.1.0
111
-	 */
112
-	public function getId(): string;
105
+    /**
106
+     * Wrapper around session_id
107
+     *
108
+     * @return string
109
+     * @throws SessionNotAvailableException
110
+     * @since 9.1.0
111
+     */
112
+    public function getId(): string;
113 113
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/Http/StrictInlineContentSecurityPolicy.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -42,10 +42,10 @@
 block discarded – undo
42 42
  */
43 43
 class StrictInlineContentSecurityPolicy extends ContentSecurityPolicy {
44 44
 
45
-	/**
46
-	 * @since 14.0.0
47
-	 */
48
-	public function __construct() {
49
-		$this->inlineStyleAllowed = false;
50
-	}
45
+    /**
46
+     * @since 14.0.0
47
+     */
48
+    public function __construct() {
49
+        $this->inlineStyleAllowed = false;
50
+    }
51 51
 }
Please login to merge, or discard this patch.
lib/private/Repair/AddCleanupUpdaterBackupsJob.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -30,19 +30,19 @@
 block discarded – undo
30 30
 
31 31
 class AddCleanupUpdaterBackupsJob implements IRepairStep {
32 32
 
33
-	/** @var IJobList */
34
-	protected $jobList;
33
+    /** @var IJobList */
34
+    protected $jobList;
35 35
 
36
-	public function __construct(IJobList $jobList) {
37
-		$this->jobList = $jobList;
38
-	}
36
+    public function __construct(IJobList $jobList) {
37
+        $this->jobList = $jobList;
38
+    }
39 39
 
40
-	public function getName() {
41
-		return 'Queue a one-time job to cleanup old backups of the updater';
42
-	}
40
+    public function getName() {
41
+        return 'Queue a one-time job to cleanup old backups of the updater';
42
+    }
43 43
 
44
-	public function run(IOutput $output) {
45
-		$this->jobList->add(BackgroundCleanupUpdaterBackupsJob::class);
46
-	}
44
+    public function run(IOutput $output) {
45
+        $this->jobList->add(BackgroundCleanupUpdaterBackupsJob::class);
46
+    }
47 47
 }
48 48
 
Please login to merge, or discard this patch.
apps/accessibility/lib/Settings/PersonalSection.php 1 patch
Indentation   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -29,72 +29,72 @@
 block discarded – undo
29 29
 
30 30
 class PersonalSection implements IIconSection {
31 31
 
32
-	/** @var string */
33
-	protected $appName;
32
+    /** @var string */
33
+    protected $appName;
34 34
 
35
-	/** @var IURLGenerator */
36
-	private $urlGenerator;
35
+    /** @var IURLGenerator */
36
+    private $urlGenerator;
37 37
 
38
-	/** @var IL10N */
39
-	private $l;
38
+    /** @var IL10N */
39
+    private $l;
40 40
 
41
-	/**
42
-	 * Personal Section constructor.
43
-	 *
44
-	 * @param string $appName
45
-	 * @param IURLGenerator $urlGenerator
46
-	 * @param IL10N $l
47
-	 */
48
-	public function __construct(string $appName,
49
-								IURLGenerator $urlGenerator,
50
-								IL10N $l) {
51
-		$this->appName      = $appName;
52
-		$this->urlGenerator = $urlGenerator;
53
-		$this->l            = $l;
54
-	}
41
+    /**
42
+     * Personal Section constructor.
43
+     *
44
+     * @param string $appName
45
+     * @param IURLGenerator $urlGenerator
46
+     * @param IL10N $l
47
+     */
48
+    public function __construct(string $appName,
49
+                                IURLGenerator $urlGenerator,
50
+                                IL10N $l) {
51
+        $this->appName      = $appName;
52
+        $this->urlGenerator = $urlGenerator;
53
+        $this->l            = $l;
54
+    }
55 55
 
56
-	/**
57
-	 * returns the relative path to an 16*16 icon describing the section.
58
-	 * e.g. '/core/img/places/files.svg'
59
-	 *
60
-	 * @returns string
61
-	 * @since 13.0.0
62
-	 */
63
-	public function getIcon() {
64
-		return $this->urlGenerator->imagePath($this->appName, 'app-dark.svg');
65
-	}
56
+    /**
57
+     * returns the relative path to an 16*16 icon describing the section.
58
+     * e.g. '/core/img/places/files.svg'
59
+     *
60
+     * @returns string
61
+     * @since 13.0.0
62
+     */
63
+    public function getIcon() {
64
+        return $this->urlGenerator->imagePath($this->appName, 'app-dark.svg');
65
+    }
66 66
 
67
-	/**
68
-	 * returns the ID of the section. It is supposed to be a lower case string,
69
-	 * e.g. 'ldap'
70
-	 *
71
-	 * @returns string
72
-	 * @since 9.1
73
-	 */
74
-	public function getID() {
75
-		return $this->appName;
76
-	}
67
+    /**
68
+     * returns the ID of the section. It is supposed to be a lower case string,
69
+     * e.g. 'ldap'
70
+     *
71
+     * @returns string
72
+     * @since 9.1
73
+     */
74
+    public function getID() {
75
+        return $this->appName;
76
+    }
77 77
 
78
-	/**
79
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
80
-	 * integration'. Use the L10N service to translate it.
81
-	 *
82
-	 * @return string
83
-	 * @since 9.1
84
-	 */
85
-	public function getName() {
86
-		return $this->l->t('Accessibility');
87
-	}
78
+    /**
79
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
80
+     * integration'. Use the L10N service to translate it.
81
+     *
82
+     * @return string
83
+     * @since 9.1
84
+     */
85
+    public function getName() {
86
+        return $this->l->t('Accessibility');
87
+    }
88 88
 
89
-	/**
90
-	 * @return int whether the form should be rather on the top or bottom of
91
-	 * the settings navigation. The sections are arranged in ascending order of
92
-	 * the priority values. It is required to return a value between 0 and 99.
93
-	 *
94
-	 * E.g.: 70
95
-	 * @since 9.1
96
-	 */
97
-	public function getPriority() {
98
-		return 15;
99
-	}
89
+    /**
90
+     * @return int whether the form should be rather on the top or bottom of
91
+     * the settings navigation. The sections are arranged in ascending order of
92
+     * the priority values. It is required to return a value between 0 and 99.
93
+     *
94
+     * E.g.: 70
95
+     * @since 9.1
96
+     */
97
+    public function getPriority() {
98
+        return 15;
99
+    }
100 100
 }
Please login to merge, or discard this patch.
lib/private/Authentication/Token/PublicKeyToken.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -184,7 +184,7 @@
 block discarded – undo
184 184
 		if (is_array($scope)) {
185 185
 			parent::setScope(json_encode($scope));
186 186
 		} else {
187
-			parent::setScope((string)$scope);
187
+			parent::setScope((string) $scope);
188 188
 		}
189 189
 	}
190 190
 
Please login to merge, or discard this patch.
Indentation   +184 added lines, -184 removed lines patch added patch discarded remove patch
@@ -47,188 +47,188 @@
 block discarded – undo
47 47
  * @method bool getPasswordInvalid()
48 48
  */
49 49
 class PublicKeyToken extends Entity implements INamedToken, IWipeableToken {
50
-	public const VERSION = 2;
51
-
52
-	/** @var string user UID */
53
-	protected $uid;
54
-
55
-	/** @var string login name used for generating the token */
56
-	protected $loginName;
57
-
58
-	/** @var string encrypted user password */
59
-	protected $password;
60
-
61
-	/** @var string token name (e.g. browser/OS) */
62
-	protected $name;
63
-
64
-	/** @var string */
65
-	protected $token;
66
-
67
-	/** @var int */
68
-	protected $type;
69
-
70
-	/** @var int */
71
-	protected $remember;
72
-
73
-	/** @var int */
74
-	protected $lastActivity;
75
-
76
-	/** @var int */
77
-	protected $lastCheck;
78
-
79
-	/** @var string */
80
-	protected $scope;
81
-
82
-	/** @var int */
83
-	protected $expires;
84
-
85
-	/** @var string */
86
-	protected $privateKey;
87
-
88
-	/** @var string */
89
-	protected $publicKey;
90
-
91
-	/** @var int */
92
-	protected $version;
93
-
94
-	/** @var bool */
95
-	protected $passwordInvalid;
96
-
97
-	public function __construct() {
98
-		$this->addType('uid', 'string');
99
-		$this->addType('loginName', 'string');
100
-		$this->addType('password', 'string');
101
-		$this->addType('name', 'string');
102
-		$this->addType('token', 'string');
103
-		$this->addType('type', 'int');
104
-		$this->addType('remember', 'int');
105
-		$this->addType('lastActivity', 'int');
106
-		$this->addType('lastCheck', 'int');
107
-		$this->addType('scope', 'string');
108
-		$this->addType('expires', 'int');
109
-		$this->addType('publicKey', 'string');
110
-		$this->addType('privateKey', 'string');
111
-		$this->addType('version', 'int');
112
-		$this->addType('passwordInvalid', 'bool');
113
-	}
114
-
115
-	public function getId(): int {
116
-		return $this->id;
117
-	}
118
-
119
-	public function getUID(): string {
120
-		return $this->uid;
121
-	}
122
-
123
-	/**
124
-	 * Get the login name used when generating the token
125
-	 *
126
-	 * @return string
127
-	 */
128
-	public function getLoginName(): string {
129
-		return parent::getLoginName();
130
-	}
131
-
132
-	/**
133
-	 * Get the (encrypted) login password
134
-	 *
135
-	 * @return string|null
136
-	 */
137
-	public function getPassword() {
138
-		return parent::getPassword();
139
-	}
140
-
141
-	public function jsonSerialize() {
142
-		return [
143
-			'id' => $this->id,
144
-			'name' => $this->name,
145
-			'lastActivity' => $this->lastActivity,
146
-			'type' => $this->type,
147
-			'scope' => $this->getScopeAsArray()
148
-		];
149
-	}
150
-
151
-	/**
152
-	 * Get the timestamp of the last password check
153
-	 *
154
-	 * @return int
155
-	 */
156
-	public function getLastCheck(): int {
157
-		return parent::getLastCheck();
158
-	}
159
-
160
-	/**
161
-	 * Get the timestamp of the last password check
162
-	 *
163
-	 * @param int $time
164
-	 */
165
-	public function setLastCheck(int $time) {
166
-		parent::setLastCheck($time);
167
-	}
168
-
169
-	public function getScope(): string {
170
-		$scope = parent::getScope();
171
-		if ($scope === null) {
172
-			return '';
173
-		}
174
-
175
-		return $scope;
176
-	}
177
-
178
-	public function getScopeAsArray(): array {
179
-		$scope = json_decode($this->getScope(), true);
180
-		if (!$scope) {
181
-			return [
182
-				'filesystem'=> true
183
-			];
184
-		}
185
-		return $scope;
186
-	}
187
-
188
-	public function setScope($scope) {
189
-		if (is_array($scope)) {
190
-			parent::setScope(json_encode($scope));
191
-		} else {
192
-			parent::setScope((string)$scope);
193
-		}
194
-	}
195
-
196
-	public function getName(): string {
197
-		return parent::getName();
198
-	}
199
-
200
-	public function setName(string $name): void {
201
-		parent::setName($name);
202
-	}
203
-
204
-	public function getRemember(): int {
205
-		return parent::getRemember();
206
-	}
207
-
208
-	public function setToken(string $token) {
209
-		parent::setToken($token);
210
-	}
211
-
212
-	public function setPassword(string $password = null) {
213
-		parent::setPassword($password);
214
-	}
215
-
216
-	public function setExpires($expires) {
217
-		parent::setExpires($expires);
218
-	}
219
-
220
-	/**
221
-	 * @return int|null
222
-	 */
223
-	public function getExpires() {
224
-		return parent::getExpires();
225
-	}
226
-
227
-	public function setPasswordInvalid(bool $invalid) {
228
-		parent::setPasswordInvalid($invalid);
229
-	}
230
-
231
-	public function wipe(): void {
232
-		parent::setType(IToken::WIPE_TOKEN);
233
-	}
50
+    public const VERSION = 2;
51
+
52
+    /** @var string user UID */
53
+    protected $uid;
54
+
55
+    /** @var string login name used for generating the token */
56
+    protected $loginName;
57
+
58
+    /** @var string encrypted user password */
59
+    protected $password;
60
+
61
+    /** @var string token name (e.g. browser/OS) */
62
+    protected $name;
63
+
64
+    /** @var string */
65
+    protected $token;
66
+
67
+    /** @var int */
68
+    protected $type;
69
+
70
+    /** @var int */
71
+    protected $remember;
72
+
73
+    /** @var int */
74
+    protected $lastActivity;
75
+
76
+    /** @var int */
77
+    protected $lastCheck;
78
+
79
+    /** @var string */
80
+    protected $scope;
81
+
82
+    /** @var int */
83
+    protected $expires;
84
+
85
+    /** @var string */
86
+    protected $privateKey;
87
+
88
+    /** @var string */
89
+    protected $publicKey;
90
+
91
+    /** @var int */
92
+    protected $version;
93
+
94
+    /** @var bool */
95
+    protected $passwordInvalid;
96
+
97
+    public function __construct() {
98
+        $this->addType('uid', 'string');
99
+        $this->addType('loginName', 'string');
100
+        $this->addType('password', 'string');
101
+        $this->addType('name', 'string');
102
+        $this->addType('token', 'string');
103
+        $this->addType('type', 'int');
104
+        $this->addType('remember', 'int');
105
+        $this->addType('lastActivity', 'int');
106
+        $this->addType('lastCheck', 'int');
107
+        $this->addType('scope', 'string');
108
+        $this->addType('expires', 'int');
109
+        $this->addType('publicKey', 'string');
110
+        $this->addType('privateKey', 'string');
111
+        $this->addType('version', 'int');
112
+        $this->addType('passwordInvalid', 'bool');
113
+    }
114
+
115
+    public function getId(): int {
116
+        return $this->id;
117
+    }
118
+
119
+    public function getUID(): string {
120
+        return $this->uid;
121
+    }
122
+
123
+    /**
124
+     * Get the login name used when generating the token
125
+     *
126
+     * @return string
127
+     */
128
+    public function getLoginName(): string {
129
+        return parent::getLoginName();
130
+    }
131
+
132
+    /**
133
+     * Get the (encrypted) login password
134
+     *
135
+     * @return string|null
136
+     */
137
+    public function getPassword() {
138
+        return parent::getPassword();
139
+    }
140
+
141
+    public function jsonSerialize() {
142
+        return [
143
+            'id' => $this->id,
144
+            'name' => $this->name,
145
+            'lastActivity' => $this->lastActivity,
146
+            'type' => $this->type,
147
+            'scope' => $this->getScopeAsArray()
148
+        ];
149
+    }
150
+
151
+    /**
152
+     * Get the timestamp of the last password check
153
+     *
154
+     * @return int
155
+     */
156
+    public function getLastCheck(): int {
157
+        return parent::getLastCheck();
158
+    }
159
+
160
+    /**
161
+     * Get the timestamp of the last password check
162
+     *
163
+     * @param int $time
164
+     */
165
+    public function setLastCheck(int $time) {
166
+        parent::setLastCheck($time);
167
+    }
168
+
169
+    public function getScope(): string {
170
+        $scope = parent::getScope();
171
+        if ($scope === null) {
172
+            return '';
173
+        }
174
+
175
+        return $scope;
176
+    }
177
+
178
+    public function getScopeAsArray(): array {
179
+        $scope = json_decode($this->getScope(), true);
180
+        if (!$scope) {
181
+            return [
182
+                'filesystem'=> true
183
+            ];
184
+        }
185
+        return $scope;
186
+    }
187
+
188
+    public function setScope($scope) {
189
+        if (is_array($scope)) {
190
+            parent::setScope(json_encode($scope));
191
+        } else {
192
+            parent::setScope((string)$scope);
193
+        }
194
+    }
195
+
196
+    public function getName(): string {
197
+        return parent::getName();
198
+    }
199
+
200
+    public function setName(string $name): void {
201
+        parent::setName($name);
202
+    }
203
+
204
+    public function getRemember(): int {
205
+        return parent::getRemember();
206
+    }
207
+
208
+    public function setToken(string $token) {
209
+        parent::setToken($token);
210
+    }
211
+
212
+    public function setPassword(string $password = null) {
213
+        parent::setPassword($password);
214
+    }
215
+
216
+    public function setExpires($expires) {
217
+        parent::setExpires($expires);
218
+    }
219
+
220
+    /**
221
+     * @return int|null
222
+     */
223
+    public function getExpires() {
224
+        return parent::getExpires();
225
+    }
226
+
227
+    public function setPasswordInvalid(bool $invalid) {
228
+        parent::setPasswordInvalid($invalid);
229
+    }
230
+
231
+    public function wipe(): void {
232
+        parent::setType(IToken::WIPE_TOKEN);
233
+    }
234 234
 }
Please login to merge, or discard this patch.