Completed
Pull Request — master (#24189)
by Christoph
09:38
created
lib/private/Group/Manager.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@
 block discarded – undo
152 152
 
153 153
 	/**
154 154
 	 * @param string $gid
155
-	 * @return \OCP\IGroup
155
+	 * @return null|Group
156 156
 	 */
157 157
 	protected function getGroupObject($gid) {
158 158
 		$backends = array();
Please login to merge, or discard this patch.
lib/private/Installer.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -476,7 +476,7 @@
 block discarded – undo
476 476
 
477 477
 	/**
478 478
 	 * Removes an app
479
-	 * @param string $name name of the application to remove
479
+	 * @param string $appId
480 480
 	 * @return boolean
481 481
 	 *
482 482
 	 *
Please login to merge, or discard this patch.
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/private/user/session.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 	 *
294 294
 	 * @param string $uid
295 295
 	 * @param string $password
296
-	 * @return boolean|null
296
+	 * @return boolean
297 297
 	 * @throws LoginException
298 298
 	 */
299 299
 	public function login($uid, $password) {
@@ -369,6 +369,9 @@  discard block
 block discarded – undo
369 369
 		return false;
370 370
 	}
371 371
 
372
+	/**
373
+	 * @param string $uid
374
+	 */
372 375
 	private function loginWithToken($uid) {
373 376
 		//$this->manager->emit('\OC\User', 'preTokenLogin', array($uid));
374 377
 		$user = $this->manager->get($uid);
Please login to merge, or discard this patch.