Completed
Pull Request — master (#24189)
by Christoph
22:24
created
lib/private/connector/sabre/auth.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@
 block discarded – undo
150 150
 
151 151
 	/**
152 152
 	 * @param \Sabre\DAV\Server $server
153
-	 * @param $realm
153
+	 * @param string $realm
154 154
 	 * @return bool
155 155
 	 */
156 156
 	private function auth(\Sabre\DAV\Server $server, $realm) {
Please login to merge, or discard this patch.
lib/private/user/user.php 1 patch
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 	/**
328 328
 	 * get the users email address
329 329
 	 *
330
-	 * @return string|null
330
+	 * @return string
331 331
 	 * @since 9.0.0
332 332
 	 */
333 333
 	public function getEMailAddress() {
@@ -412,6 +412,10 @@  discard block
 block discarded – undo
412 412
 		return $url;
413 413
 	}
414 414
 
415
+	/**
416
+	 * @param string $feature
417
+	 * @param string $value
418
+	 */
415 419
 	public function triggerChange($feature, $value = null) {
416 420
 		if ($this->emitter) {
417 421
 			$this->emitter->emit('\OC\User', 'changeUser', array($this, $feature, $value));
@@ -434,7 +438,7 @@  discard block
 block discarded – undo
434 438
 	 * instead of username-passwords. An authentication token will bypass
435 439
 	 * two-factor authentication and may be revoked.
436 440
 	 *
437
-	 * @return array
441
+	 * @return string[]
438 442
 	 */
439 443
 	public function getAuthenticationTokens() {
440 444
 		// FIXME
Please login to merge, or discard this patch.
lib/private/user/session.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 	/**
163 163
 	 * get the current active user
164 164
 	 *
165
-	 * @return IUser|null Current user, otherwise null
165
+	 * @return null|User Current user, otherwise null
166 166
 	 */
167 167
 	public function getUser() {
168 168
 		// FIXME: This is a quick'n dirty work-around for the incognito mode as
@@ -277,6 +277,9 @@  discard block
 block discarded – undo
277 277
 		}
278 278
 	}
279 279
 
280
+	/**
281
+	 * @param string $uid
282
+	 */
280 283
 	private function loginWithToken($uid) {
281 284
 		$this->session->regenerateId();
282 285
 		//$this->manager->emit('\OC\User', 'preTokenLogin', array($uid));
Please login to merge, or discard this patch.