Completed
Pull Request — master (#24189)
by Christoph
09:15
created
apps/dav/appinfo/application.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,6 @@
 block discarded – undo
25 25
 use OCA\DAV\CalDAV\CalDavBackend;
26 26
 use OCA\DAV\CardDAV\CardDavBackend;
27 27
 use OCA\DAV\CardDAV\ContactsManager;
28
-use OCA\DAV\CardDAV\SyncJob;
29 28
 use OCA\DAV\CardDAV\SyncService;
30 29
 use OCA\DAV\Connector\Sabre\Principal;
31 30
 use OCA\DAV\DAV\GroupPrincipalBackend;
Please login to merge, or discard this patch.
lib/public/App/ManagerEvent.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 	 * DispatcherEvent constructor.
47 47
 	 *
48 48
 	 * @param string $event
49
-	 * @param $appID
49
+	 * @param string $appID
50 50
 	 * @param \OCP\IGroup[] $groups
51 51
 	 * @since 9.0.0
52 52
 	 */
Please login to merge, or discard this patch.
lib/private/user/session.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 	/**
190 190
 	 * get the current active user
191 191
 	 *
192
-	 * @return IUser|null Current user, otherwise null
192
+	 * @return null|User Current user, otherwise null
193 193
 	 */
194 194
 	public function getUser() {
195 195
 		// FIXME: This is a quick'n dirty work-around for the incognito mode as
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 	 *
295 295
 	 * @param string $uid
296 296
 	 * @param string $password
297
-	 * @return boolean|null
297
+	 * @return boolean
298 298
 	 * @throws LoginException
299 299
 	 */
300 300
 	public function login($uid, $password) {
@@ -368,6 +368,9 @@  discard block
 block discarded – undo
368 368
 		return false;
369 369
 	}
370 370
 
371
+	/**
372
+	 * @param string $uid
373
+	 */
371 374
 	private function loginWithToken($uid) {
372 375
 		// TODO: $this->manager->emit('\OC\User', 'preTokenLogin', array($uid));
373 376
 		$user = $this->manager->get($uid);
Please login to merge, or discard this patch.
lib/public/AppFramework/Db/Mapper.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -308,6 +308,7 @@  discard block
 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
 	 */
@@ -360,7 +361,7 @@  discard block
 block discarded – undo
360 361
 	 * Returns an db result and throws exceptions when there are more or less
361 362
 	 * results
362 363
 	 * @param string $sql the sql query
363
-	 * @param array $params the parameters of the sql query
364
+	 * @param string[] $params the parameters of the sql query
364 365
 	 * @param int $limit the maximum number of rows
365 366
 	 * @param int $offset from which row we want to start
366 367
 	 * @throws DoesNotExistException if the item does not exist
Please login to merge, or discard this patch.