Completed
Pull Request — master (#27205)
by Thomas
25:41
created
lib/private/User/User.php 1 patch
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 *
72 72
 	 * @param Account $account
73 73
 	 * @param AccountMapper $mapper
74
-	 * @param null $emitter
74
+	 * @param Manager $emitter
75 75
 	 * @param IConfig|null $config
76 76
 	 * @param null $urlGenerator
77 77
 	 * @param EventDispatcher|null $eventDispatcher
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	/**
97 97
 	 * get the user id
98 98
 	 *
99
-	 * @return string
99
+	 * @return integer
100 100
 	 */
101 101
 	public function getUID() {
102 102
 		return $this->account->getUserId();
@@ -413,6 +413,10 @@  discard block
 block discarded – undo
413 413
 		return $url;
414 414
 	}
415 415
 
416
+	/**
417
+	 * @param string $feature
418
+	 * @param string $value
419
+	 */
416 420
 	public function triggerChange($feature, $value = null) {
417 421
 		if ($this->emitter) {
418 422
 			$this->emitter->emit('\OC\User', 'changeUser', [$this, $feature, $value]);
Please login to merge, or discard this patch.
lib/public/AppFramework/Db/Mapper.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -308,6 +308,7 @@
 block discarded – undo
308 308
 	 * @param array $params the parameters of the sql query
309 309
 	 * @param int $limit the maximum number of rows
310 310
 	 * @param int $offset from which row we want to start
311
+	 * @param string $msg
311 312
 	 * @return string formatted error message string
312 313
 	 * @since 9.1.0
313 314
 	 */
Please login to merge, or discard this patch.
lib/base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -329,7 +329,7 @@
 block discarded – undo
329 329
 	/**
330 330
 	 * Checks if the version requires an update and shows
331 331
 	 * @param bool $showTemplate Whether an update screen should get shown
332
-	 * @return bool
332
+	 * @return null|boolean
333 333
 	 */
334 334
 	public static function checkUpgrade($showTemplate = true) {
335 335
 		if (\OCP\Util::needUpgrade()) {
Please login to merge, or discard this patch.
lib/private/User/Account.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,6 @@
 block discarded – undo
24 24
 
25 25
 
26 26
 use OCP\AppFramework\Db\Entity;
27
-use OCP\AppFramework\QueryException;
28 27
 use OCP\UserInterface;
29 28
 
30 29
 /**
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -69,6 +69,9 @@
 block discarded – undo
69 69
 		$this->addType('state', 'integer');
70 70
 	}
71 71
 
72
+	/**
73
+	 * @param string $uid
74
+	 */
72 75
 	public function setUserId($uid) {
73 76
 		parent::setter('lowerUserId', [strtolower($uid)]);
74 77
 		parent::setter('userId', [$uid]);
Please login to merge, or discard this patch.
core/Migrations/Version20170221114437.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -1,11 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace OC\Migrations;
3 3
 
4
-use OC\User\Account;
5 4
 use OC\User\AccountMapper;
6 5
 use OC\User\Database;
7 6
 use OC\User\SyncService;
8
-use OCP\IConfig;
9 7
 use OCP\Migration\ISimpleMigration;
10 8
 use OCP\Migration\IOutput;
11 9
 
Please login to merge, or discard this patch.
lib/private/User/RemoteUser.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -184,7 +184,7 @@
 block discarded – undo
184 184
 	/**
185 185
 	 * get the users email address
186 186
 	 *
187
-	 * @return string|null
187
+	 * @return boolean
188 188
 	 * @since 9.0.0
189 189
 	 */
190 190
 	public function getEMailAddress() {
Please login to merge, or discard this patch.
lib/private/User/Manager.php 2 patches
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -76,7 +76,6 @@  discard block
 block discarded – undo
76 76
 
77 77
 	/**
78 78
 	 * @param \OCP\IConfig $config
79
-	 * @param IDBConnection $connection
80 79
 	 */
81 80
 	public function __construct(IConfig $config, AccountMapper $accountMapper) {
82 81
 		$this->config = $config;
@@ -337,7 +336,6 @@  discard block
 block discarded – undo
337 336
 
338 337
 	/**
339 338
 	 * @param \Closure $callback
340
-	 * @param string $search
341 339
 	 * @since 10.0
342 340
 	 */
343 341
 	public function callForSeenUsers (\Closure $callback) {
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,6 @@
 block discarded – undo
33 33
 namespace OC\User;
34 34
 
35 35
 use OC\Hooks\PublicEmitter;
36
-use OCA\User_LDAP\LDAP;
37 36
 use OCP\AppFramework\Db\DoesNotExistException;
38 37
 use OCP\IDBConnection;
39 38
 use OCP\IUser;
Please login to merge, or discard this patch.